git, branch v1.6.4-rc0

Makefile: install 'git' in execdir

2009-07-09T08:19:51Z

When a git command executes a subcommand, it uses the "git foo" form, which relies on finding "git" in the PATH. Normally this should not be a problem, since the same "git" that was used to invoke git in the first place will be found. And if somebody invokes a "git" outside of the PATH (e.g., by giving its absolute path), this case is already covered: we put that absolute path onto the front of PATH. However, if one is using "sudo", then sudo will execute the "git" from the PATH, but pass along a restricted PATH that may not contain the original "git" directory. In this case, executing a subcommand will fail. To solve this, we put the "git" wrapper itself into the execdir; this directory is prepended to the PATH when git starts, so the wrapper will always be found. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ld/push-porcelain-output-format'

2009-07-09T08:07:54Z

* ld/push-porcelain-output-format: add --porcelain option to git-push

Merge branch 'gb/gitweb-avatar'

2009-07-09T08:00:59Z

* gb/gitweb-avatar: gitweb: add empty alt text to avatar img gitweb: picon avatar provider gitweb: gravatar url cache gitweb: (gr)avatar support gitweb: use git_print_authorship_rows in 'tag' view too gitweb: uniform author info for commit and commitdiff gitweb: refactor author name insertion

Merge branch 'ml/http'

2009-07-09T08:00:36Z

* ml/http: http.c: add http.sslCertPasswordProtected option http.c: prompt for SSL client certificate password Conflicts: http.c

Merge branch 'rs/grep-p'

2009-07-09T07:59:58Z

* rs/grep-p: grep: simplify -p output grep -p: support user defined regular expressions grep: add option -p/--show-function grep: handle pre context lines on demand grep: print context hunk marks between files grep: move context hunk mark handling into show_line() userdiff: add xdiff_clear_find_func()

Merge branch 'js/run-command-updates' (early part)

2009-07-09T07:59:32Z

* 'js/run-command-updates' (early part): MinGW: truncate exit()'s argument to lowest 8 bits

git-svn.txt: fix description of fetch flags accepted by clone.

2009-07-08T17:42:27Z

Signed-off-by: Yann Dirson Acked-by: Eric Wong Signed-off-by: Junio C Hamano

git-svn.txt: fix fetch flags incorrectly documented as init flags.

2009-07-08T17:42:27Z

Signed-off-by: Yann Dirson Acked-by: Eric Wong Signed-off-by: Junio C Hamano

git-svn.txt: make formatting more consistent.

2009-07-08T17:42:27Z

- correctly link paragraphs within list items - consistently format examples - put option alernatives on separate lines - always use [verse] for config items - always indent 1st paragraph of a list item, with a tab Signed-off-by: Yann Dirson Acked-by: Eric Wong Signed-off-by: Junio C Hamano

git-svn.txt: stop using dash-form of commands.

2009-07-08T17:42:27Z

Also consistently use single quotes around git commands to make things clear (was only needed at a couple of places). Signed-off-by: Yann Dirson Acked-by: Eric Wong Signed-off-by: Junio C Hamano