diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 13:44:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 13:44:32 -0700 |
| commit | 7f1d1129628c63f46aebe03afacdb2ab259ef2d6 (patch) | |
| tree | da1b0ba8f3dc8a2177d75d25c4abd537edaa59fe /git-merge-one-file-script | |
| parent | Make "git commit" work correctly in the presense of a manual merge (diff) | |
| download | git-7f1d1129628c63f46aebe03afacdb2ab259ef2d6.tar.gz git-7f1d1129628c63f46aebe03afacdb2ab259ef2d6.zip | |
Remove MERGE_HEAD after committing merge
Diffstat (limited to 'git-merge-one-file-script')
0 files changed, 0 insertions, 0 deletions