| commit | eaf761ecfb9857df22e4c3a1d9014d9f3964dc02 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 11 May 2008 19:57:49 +0000 (11 12:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 11 May 2008 19:57:49 +0000 (11 12:57 -0700) | ||
| tree | d91a2df4e317d5b0b2b5303e28d24972a035f8fe | treesnapshot (tar.gz zip) |
| parent | 7b4257a746a252f3f41547feb96641b22d172fc3 | commitdiff |
| parent | 65ea3b8c6d9517c5d7f2a6c089cc6578c9486114 | commitdiff |
Merge branch 'master' into next
* master:
rev-parse --verify: do not output anything on error
rev-parse: fix using "--default" with "--verify"
rev-parse: add test script for "--verify"
Add svn-compatible "blame" output format to git-svn
mergetool: Make ECMerge use the settings as specified by the user in the GUI
git-format-patch: add --no-binary to omit binary changes in the patch.
wt-status.h: declare global variables as extern
builtin-commit.c: add -u as short name for --untracked-files
git-repack: re-enable parsing of -n command line option
Allow tracking branches to set up rebase by default.
git-svn: fix cloning of HTTP URLs with '+' in their path
alloc_ref_from_str(): factor out a common pattern of alloc_ref from string
Conflicts:
t/t9115-git-svn-dcommit-funky-renames.sh
* master:
rev-parse --verify: do not output anything on error
rev-parse: fix using "--default" with "--verify"
rev-parse: add test script for "--verify"
Add svn-compatible "blame" output format to git-svn
mergetool: Make ECMerge use the settings as specified by the user in the GUI
git-format-patch: add --no-binary to omit binary changes in the patch.
wt-status.h: declare global variables as extern
builtin-commit.c: add -u as short name for --untracked-files
git-repack: re-enable parsing of -n command line option
Allow tracking branches to set up rebase by default.
git-svn: fix cloning of HTTP URLs with '+' in their path
alloc_ref_from_str(): factor out a common pattern of alloc_ref from string
Conflicts:
t/t9115-git-svn-dcommit-funky-renames.sh