diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:19 -0700 |
| commit | 61efc5c2d81cbd8c9a5d145e1aab2f744772c856 (patch) | |
| tree | 8377ac15f7319bf34d9f9a5869778c886b341a26 /upload-pack.c | |
| parent | 00f27feb6afaa9e5f91a0852a5a20c041ba0a421 (diff) | |
| parent | b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f (diff) | |
| download | git-61efc5c2d81cbd8c9a5d145e1aab2f744772c856.tar.gz | |
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
Diffstat (limited to 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions