Junio C Hamano 78ad09403c 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
2017-09-10 17:02:55 +09:00
..
2017-08-23 14:36:03 -07:00
2016-07-13 11:24:14 -07:00
2016-10-10 14:03:51 -07:00
2017-04-13 16:15:25 -07:00
2017-01-18 15:12:12 -08:00
2015-07-21 14:08:14 -07:00
2016-08-11 14:35:42 -07:00
2017-06-27 10:35:49 -07:00
2015-10-05 12:30:13 -07:00
2017-07-12 15:18:21 -07:00
2017-06-05 09:05:38 +09:00
2017-05-16 11:13:00 +09:00
2017-01-18 15:12:18 -08:00
2017-05-01 11:01:52 +09:00
2017-06-22 15:25:25 -07:00