diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 20:33:15 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 20:33:15 (GMT) |
| commit | 9c065315f70fb1086ef16fc37e72e3edbaf3e919 (patch) | |
| tree | 5717f05f0dddfe22bff7b264c5c0b385fa29b0c1 /git-resolve-script | |
| parent | 3c65eb184992c2d088f30e0a788e598dab5bba2a (diff) | |
| download | git-9c065315f70fb1086ef16fc37e72e3edbaf3e919.zip git-9c065315f70fb1086ef16fc37e72e3edbaf3e919.tar.gz git-9c065315f70fb1086ef16fc37e72e3edbaf3e919.tar.bz2 | |
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.
Diffstat (limited to 'git-resolve-script')
| -rw-r--r-- | git-resolve-script | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-resolve-script b/git-resolve-script index da79a97..0b04a5f 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -57,4 +57,5 @@ fi result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge) echo "Committed merge $result_commit" echo $result_commit > "$GIT_DIR"/HEAD -git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat +git-diff-tree -p $head $result_commit | git-apply --stat +rm $GIT_DIR/ORIG_HEAD $GIT_DIR/MERGE_HEAD |