| commit | 78ad09403c0c87ae52573bbac2fa7e093152891d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Sep 2017 08:02:55 +0000 (10 17:02 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Sep 2017 08:02:55 +0000 (10 17:02 +0900) | ||
| tree | 6bb756e0eb4ff1dd98ab5e2b97b5e325bdd6e800 | treesnapshot (tar.gz zip) |
| parent | 648a50a08ad3d6718899a30a438ff97b4bdda342 | commitdiff |
| parent | 9d89b35526b54c3ba33371b184a1ba6e30f8f46f | commitdiff |
Merge branch 'mg/killed-merge' into maint
Killing "git merge --edit" before the editor returns control left
the repository in a state with MERGE_MSG but without MERGE_HEAD,
which incorrectly tells the subsequent "git commit" that there was
a squash merge in progress. This has been fixed.
* mg/killed-merge:
merge: save merge state earlier
merge: split write_merge_state in two
merge: clarify call chain
Documentation/git-merge: explain --continue
Killing "git merge --edit" before the editor returns control left
the repository in a state with MERGE_MSG but without MERGE_HEAD,
which incorrectly tells the subsequent "git commit" that there was
a squash merge in progress. This has been fixed.
* mg/killed-merge:
merge: save merge state earlier
merge: split write_merge_state in two
merge: clarify call chain
Documentation/git-merge: explain --continue
| builtin/merge.c | diff1 | diff2 | blobhistory |