Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mm/status-suggest-merge-abort'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 3 Aug 2016 22:10:26 +0000
(15:10 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 3 Aug 2016 22:10:26 +0000
(15:10 -0700)
"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
1
2
wt-status.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
d083d42
b0a61ab
)
diff --cc
wt-status.c
index 19cbc3939cdb3d6a84c0dbd88a4e43847d228363,f6f112b48cc1d7a7ca60d0712f0cd830614071e9..3175ec6ddb6d6e40f8e2cfcbbb0b4acf5f0b5e98
---
1
/
wt-status.c
---
2
/
wt-status.c
+++ b/
wt-status.c
@@@
-948,11
-946,13
+948,14
@@@
static void show_merge_in_progress(stru
{
if (has_unmerged(s)) {
status_printf_ln(s, color, _("You have unmerged paths."));
- if (s->hints)
+ if (s->hints)
{
status_printf_ln(s, color,
- _(" (fix conflicts and run \"git commit\")"));
+ _(" (fix conflicts and run \"git commit\")"));
+ status_printf_ln(s, color,
+ _(" (use \"git merge --abort\" to abort the merge)"));
+ }
} else {
+ s-> commitable = 1;
status_printf_ln(s, color,
_("All conflicts fixed but you are still merging."));
if (s->hints)