| commit | 9ef225745e2777b46364afc3297e5b06d1e29033 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Nov 2011 22:09:10 +0000 (28 14:09 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Nov 2011 22:09:10 +0000 (28 14:09 -0800) | ||
| tree | 893c6321748bcc1ac8bb55b7052e157a886cef45 | treesnapshot (tar.gz zip) |
| parent | dc26bd83971e42681506af74505e84d46a8be819 | commitdiff |
| parent | fc14b89a7e6899b8ac3b5751ec2d8c98203ea4c2 | commitdiff |
Merge branch 'master' into next
* master:
Git 1.7.8-rc4
builtin-reset: Documentation update
builtin-branch: Fix crash on invalid use of --force
revert --abort: do not leave behind useless sequencer-old directory
Fix revert --abort on Windows
revert: do not pass non-literal string as format to git_path()
Conflicts:
builtin/branch.c
* master:
Git 1.7.8-rc4
builtin-reset: Documentation update
builtin-branch: Fix crash on invalid use of --force
revert --abort: do not leave behind useless sequencer-old directory
Fix revert --abort on Windows
revert: do not pass non-literal string as format to git_path()
Conflicts:
builtin/branch.c
| builtin/branch.c | diff1 | diff2 | blobhistory |
| builtin/revert.c | diff1 | diff2 | blobhistory |