Merge branch 'maint'

Junio C Hamano committed almost 16 years ago

commit: suggest --amend --reset-author to fix commiter identity

Matthieu Moy committed almost 16 years ago

checkout: fix bug with ambiguous refs

Junio C Hamano committed almost 16 years ago

t9157-*.sh: Make the svn version check more precise

Ramsay Jones committed almost 16 years ago

userdiff: match Pascal class methods

Alexey Shumkin committed almost 16 years ago

t/README: hint about using $(pwd) rather than $PWD in tests

Johannes Sixt committed almost 16 years ago

Fix expected values of setup tests on Windows

Johannes Sixt committed almost 16 years ago

Merge branch 'maint'

Junio C Hamano committed almost 16 years ago

Merge branch 'maint-1.7.2' into maint

Junio C Hamano committed almost 16 years ago

Merge branch 'maint-1.7.1' into maint-1.7.2

Junio C Hamano committed almost 16 years ago

Merge branch 'maint-1.7.0' into maint-1.7.1

Junio C Hamano committed almost 16 years ago

docs: explain diff.*.binary option

Jeff King committed almost 16 years ago

t9010: svnadmin can fail even if available

Jonathan Nieder committed almost 16 years ago

submodule: fix relative url parsing for scp-style origin

Thomas Rast committed almost 16 years ago

Documentation/githooks: post-rewrite-copy-notes never existed

Thomas Rast committed almost 16 years ago

Documentation/git-archive: spell --worktree-attributes correctly

Thomas Rast committed almost 16 years ago

Merge branch 'maint'

Junio C Hamano committed almost 16 years ago

t4135-*.sh: Skip the "backslash" tests on cygwin

Ramsay Jones committed almost 16 years ago

t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW

Ramsay Jones committed almost 16 years ago

t3032-*.sh: Pass the -b (--binary) option to sed on cygwin

Ramsay Jones committed almost 16 years ago