improve merge popup and commands #1232

Merged
merged 1 commit into from Feb 22, 2014

Conversation

Projects
None yet
1 participant
Owner

tarsius commented Feb 22, 2014

Also see #1220.

@tarsius tarsius magit-merge-popup: improve popup and its actions
* Add new variants `magit-merge-editmsg' (which is closest to the old
  `magit-merge' but not quite the same), `magit-merge-nocommit' and a
  new `magit-merge' (which creates the merge commit right away provided
  there are no conflicts).

* Turn `magit-merge-popup' into a "sequence popup", that is if a merge
  is already in progress offer different actions: `magit-merge-abort'
  and now also `magit-commit'.
20042bc

@tarsius tarsius merged commit 20042bc into next Feb 22, 2014

tarsius deleted the n/merge-popup-1 branch Feb 22, 2014

tarsius added this to the 2.1.0 milestone Feb 22, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment