]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 648a50a 9d89b35)
Merge branch 'mg/killed-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:02:55 +0000 (17:02 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:02:55 +0000 (17:02 +0900)
commit78ad09403c0c87ae52573bbac2fa7e093152891d
tree6bb756e0eb4ff1dd98ab5e2b97b5e325bdd6e800tree | snapshot
parent648a50a08ad3d6718899a30a438ff97b4bdda342commit | diff
parent9d89b35526b54c3ba33371b184a1ba6e30f8f46fcommit | diff
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
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.