diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:55 +0900 |
| commit | 78ad09403c0c87ae52573bbac2fa7e093152891d (patch) | |
| tree | 6bb756e0eb4ff1dd98ab5e2b97b5e325bdd6e800 /builtin/commit.c | |
| parent | Merge branch 'tb/apply-with-crlf' into maint (diff) | |
| parent | merge: save merge state earlier (diff) | |
| download | git-78ad09403c0c87ae52573bbac2fa7e093152891d.tar.gz git-78ad09403c0c87ae52573bbac2fa7e093152891d.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions