]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 00f27fe b0a61ab)
Merge branch 'mm/status-suggest-merge-abort' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:19 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:19 +0000 (11:55 -0700)
commit61efc5c2d81cbd8c9a5d145e1aab2f744772c856
tree8377ac15f7319bf34d9f9a5869778c886b341a26tree | snapshot
parent00f27feb6afaa9e5f91a0852a5a20c041ba0a421commit | diff
parentb0a61ab23c0fd51a1b641b481e6a63f8661a8f9fcommit | diff
Merge branch 'mm/status-suggest-merge-abort' into maint

"git status" learned to suggest "merge --abort" during a conflicted
merge, just like it already suggests "rebase --abort" during a
conflicted rebase.

* mm/status-suggest-merge-abort:
  status: suggest 'git merge --abort' when appropriate
wt-status.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.