projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c65eb1) | patch
Make "git commit" work correctly in the presense of a manual merge
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 20:33:15 +0000 (13:33 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 20:33:15 +0000 (13:33 -0700)
commit9c065315f70fb1086ef16fc37e72e3edbaf3e919
tree5717f05f0dddfe22bff7b264c5c0b385fa29b0c1tree | snapshot
parent3c65eb184992c2d088f30e0a788e598dab5bba2acommit | diff
Make "git commit" work correctly in the presense of a manual merge

This has gotten only very light testing, but something like this is
clearly necessary and did the right thing for the one case I threw at
it.
git-commit-script diff | blob | history
git-resolve-script diff | blob | history
The core git plumbing