mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cp/merge-continue'

Browse Source 
"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'
This commit is contained in:
Junio C Hamano
2016-12-27 00:11:41 -08:00
parent 1d73f8e86d c7d227df5b
commit 05f6e1be8c
4 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-merge.txt
View File

@ -15,6 +15,7 @@ SYNOPSIS
[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
'git merge' <msg> HEAD <commit>...
'git merge' --abort
'git merge' --continue
DESCRIPTION
-----------
@ -61,6 +62,8 @@ reconstruct the original (pre-merge) changes. Therefore:
discouraged: while possible, it may leave you in a state that is hard to
back out of in the case of a conflict.
The fourth syntax ("`git merge --continue`") can only be run after the
merge has resulted in conflicts.
OPTIONS
-------
@ -99,6 +102,11 @@ commit or stash your changes before running 'git merge'.
'git merge --abort' is equivalent to 'git reset --merge' when
`MERGE_HEAD` is present.
--continue::
After a 'git merge' stops due to conflicts you can conclude the
merge by running 'git merge --continue' (see "HOW TO RESOLVE
CONFLICTS" section below).
<commit>...::
Commits, usually other branch heads, to merge into our branch.
Specifying more than one commit will create a merge with