projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 31b6d20) | patch
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 02:42:21 +0000 (19:42 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 02:42:21 +0000 (19:42 -0700)
commit55a716cc8c93fd2eb161ae17f316ee01e8061be6
treecf4134d676441b019a7bc3c3899c268c77cbce79tree | snapshot
parent31b6d200d6c5ed019f62d88ef0926faeb0150aaccommit | diff
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..
git-resolve-script diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.