Merge branch 'maint'

Junio C Hamano committed over 16 years ago

diff: fix "git show -C -C" output when renaming a binary file

Christian Couder committed over 16 years ago

revision: Turn off history simplification in --ancestry-path mode

Johan Herland committed over 16 years ago

revision: Fix typo in --ancestry-path error message

Johan Herland committed over 16 years ago

Documentation/rev-list-options.txt: Explain --ancestry-path

Johan Herland committed over 16 years ago

Documentation/rev-list-options.txt: Fix missing line in example history graph

Johan Herland committed over 16 years ago

build: propagate $DIFF to scripts

Junio C Hamano committed over 16 years ago

ls-files: allow relative pathspec

Clemens Buchacher committed over 16 years ago

quote.c: separate quoting and relative path generation

Clemens Buchacher committed over 16 years ago

setup: document prefix

Clemens Buchacher committed over 16 years ago

Documentation+t5708: document and test status -s -b

Michael J Gruber committed over 16 years ago

Show branch information in short output of git status

Daniel Knittl-Frank committed over 16 years ago

bash completion: add --orphan to 'git checkout'

Erick Mattos committed over 16 years ago

t3200: test -l with core.logAllRefUpdates options

Erick Mattos committed over 16 years ago

checkout --orphan: respect -l option always

Erick Mattos committed over 16 years ago

git svn: fix empty directory creation

Michael J. Kiwala committed over 16 years ago

t9129: fix UTF-8 locale detection

Junio C Hamano committed over 16 years ago

git-instaweb: Add support for running gitweb via 'plackup'

Jakub Narebski committed over 16 years ago

git-instaweb: Wait for server to start before running web browser

Jakub Narebski committed over 16 years ago

git-instaweb: Remove pidfile after stopping web server

Jakub Narebski committed over 16 years ago