Merge branch 'maint'

Junio C Hamano committed about 17 years ago

t/gitweb-lib.sh: Split gitweb output into headers and body

Jakub Narebski committed about 17 years ago

Teach 'git merge' and 'git pull' the option --ff-only

Björn Gustavsson committed about 17 years ago

clone: detect extra arguments

Jonathan Nieder committed about 17 years ago

clone: fix help on options

Junio C Hamano committed about 17 years ago

push: fix typo in usage

Jeff King committed about 17 years ago

t915{0,1}: use $TEST_DIRECTORY

Jeff King committed about 17 years ago

Make t9150 and t9151 test scripts executable

Michael J Gruber committed about 17 years ago

More precise description of 'git describe --abbrev'

Gisle Aas committed about 17 years ago

ls-files: unbreak "ls-files -i"

Jeff King committed about 17 years ago

Don't create the $GIT_DIR/branches directory on init

Robin Rosenberg committed about 17 years ago

diff --color-words -U0: fix the location of hunk headers

Johannes Schindelin committed about 17 years ago

t4034-diff-words: add a test for word diff without context

Markus Heidelberg committed about 17 years ago

Make the MSVC projects use PDB/IDB files named after the project

Sebastian Schuberth committed about 17 years ago

Use faster byte swapping when compiling with MSVC

Sebastian Schuberth committed about 17 years ago

mergetool--lib: add p4merge as a pre-configured mergetool option

Scott Chacon committed about 17 years ago

describe: when failing, tell the user about options that work

Thomas Rast committed about 17 years ago

Add '--bisect' revision machinery argument

Linus Torvalds committed about 17 years ago

Merge branch 'maint'

Junio C Hamano committed about 17 years ago

commit: More generous accepting of RFC-2822 footer lines.

David Brown committed about 17 years ago