git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1d73f8e c7d227d)
Merge branch 'cp/merge-continue'
authorJunio C Hamano <redacted>
Tue, 27 Dec 2016 08:11:41 +0000 (00:11 -0800)
committerJunio C Hamano <redacted>
Tue, 27 Dec 2016 08:11:41 +0000 (00:11 -0800)
commit05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5
tree1312b104cc48f5c06c74fbf5d03ffa95e5a3f618tree | snapshot
parent1d73f8e86d7b4d95e0b7ce53eec2a5f8114722accommit | diff
parentc7d227df5bf7fe9d5df98a55cd637bfaf38685eacommit | diff
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'
builtin/merge.c diff1 | diff2 | blob | history
contrib/completion/git-completion.bash diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT