Merge branch 'maint-1.7.5' into maint

Junio C Hamano committed over 15 years ago

test: skip clean-up when running under --immediate mode

Junio C Hamano committed over 15 years ago

"branch -d" can remove more than one branches

Junio C Hamano committed over 15 years ago

rebase: do not print lots of usage hints after an obvious error message

Johannes Sixt committed over 15 years ago

Documentation/i18n: quote double-dash for AsciiDoc

Jonathan Nieder committed over 15 years ago

Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash

Junio C Hamano committed over 15 years ago

Documentation: quote double-dash for AsciiDoc

Jonathan Nieder committed over 15 years ago

git-svn: Correctly handle root commits in mergeinfo ranges

Michael Haggerty committed over 15 years ago

git-svn: Disambiguate rev-list arguments to improve error message

Michael Haggerty committed over 15 years ago

git-svn: Demonstrate a bug with root commits in mergeinfo ranges

Michael Haggerty committed over 15 years ago

git-instaweb: Check that correct config file exists for (re)start

Jakub Narebski committed over 15 years ago

git-instaweb: Move all actions at the end of script

Jakub Narebski committed over 15 years ago

git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf

Jakub Narebski committed over 15 years ago

git-instaweb: Extract configuring web server into configure_httpd

Jakub Narebski committed over 15 years ago

submodule add: always initialize .git/config entry

Jens Lehmann committed over 15 years ago

submodule sync: do not auto-vivify uninteresting submodule

Junio C Hamano committed over 15 years ago

stash: Add --include-untracked option to stash and remove all untracked files

David Caldwell committed over 15 years ago

Git 1.7.6

Junio C Hamano committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

Merge branch 'maint-1.7.4' into maint

Junio C Hamano committed over 15 years ago