Merge branch 'maint'

Junio C Hamano committed almost 18 years ago

GIT 1.6.0.5

Junio C Hamano committed almost 18 years ago

"git diff <tree>{3,}": do not reverse order of arguments

Matt McCutchen committed about 18 years ago

tag: delete TAG_EDITMSG only on successful tag

Jeff King committed almost 18 years ago

gitweb: Make project specific override for 'grep' feature work

Jakub Narebski committed almost 18 years ago

http.c: use 'git_config_string' to get 'curl_http_proxy'

Miklos Vajna committed almost 18 years ago

fetch-pack: Avoid memcpy() with src==dst

Thomas Rast committed almost 18 years ago

gitk: Fix bugs in blaming code

Paul Mackerras committed almost 18 years ago

Update draft release notes to 1.6.1

Junio C Hamano committed almost 18 years ago

Merge branch 'jc/am-options'

Junio C Hamano committed almost 18 years ago

git-am: rename apply_opt_extra file to apply-opt

Junio C Hamano committed almost 18 years ago

Test that git-am does not lose -C/-p/--whitespace options

Junio C Hamano committed almost 18 years ago

git-am: propagate --3way options as well

Junio C Hamano committed almost 18 years ago

git-am: propagate -C<n>, -p<n> options as well

Junio C Hamano committed almost 18 years ago

git-am --whitespace: do not lose the command line option

Junio C Hamano committed almost 18 years ago

git-p4: Fix bug in p4Where method.

Tor Arvid Lund committed almost 18 years ago

Report symlink failures in merge-recursive

Alex Riesen committed almost 18 years ago

Make chdir failures visible

Alex Riesen committed almost 18 years ago

Make some of fwrite/fclose/write/close failures visible

Alex Riesen committed almost 18 years ago

Add 'g' command to go to a hunk

William Pursell committed almost 18 years ago