projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ec800ab c7d227d)
Merge branch 'cp/merge-continue' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 23:38:07 +0000 (15:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 23:38:07 +0000 (15:38 -0800)
commit8ba0094f45f8530d4827ab77f64745b202fc62b0
treec2bea2bae1b40cc4ed2bacb1ada3e2a6aed8222ftree | snapshot
parentec800aba9f8f195e25a2c2db8b36513f08cf9d79commit | diff
parentc7d227df5bf7fe9d5df98a55cd637bfaf38685eacommit | diff
Merge branch 'cp/merge-continue' into next

"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'
Documentation/git-merge.txt diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
contrib/completion/git-completion.bash diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.