summaryrefslogtreecommitdiff
path: root/git-commit-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 02:42:21 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 02:42:21 (GMT)
commit55a716cc8c93fd2eb161ae17f316ee01e8061be6 (patch)
treecf4134d676441b019a7bc3c3899c268c77cbce79 /git-commit-script
parent31b6d200d6c5ed019f62d88ef0926faeb0150aac (diff)
downloadgit-55a716cc8c93fd2eb161ae17f316ee01e8061be6.zip
git-55a716cc8c93fd2eb161ae17f316ee01e8061be6.tar.gz
git-55a716cc8c93fd2eb161ae17f316ee01e8061be6.tar.bz2
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.
Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..
Diffstat (limited to 'git-commit-script')
0 files changed, 0 insertions, 0 deletions