diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:41 -0800 |
| commit | 05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5 (patch) | |
| tree | 1312b104cc48f5c06c74fbf5d03ffa95e5a3f618 /diff.h | |
| parent | Merge branch 'va/i18n-perl-scripts' (diff) | |
| parent | merge: mark usage error strings for translation (diff) | |
| download | tgif-05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5.tar.xz | |
Merge branch 'cp/merge-continue'
"git merge --continue" has been added as a synonym to "git commit"
to conclude a merge that has stopped due to conflicts.
* cp/merge-continue:
merge: mark usage error strings for translation
merge: ensure '--abort' option takes no arguments
completion: add --continue option for merge
merge: add '--continue' option as a synonym for 'git commit'
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions