Re: [RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit'

2016-12-13 Thread Chris Packham
On Mon, Dec 12, 2016 at 10:02 PM, Markus Hitter wrote: > Am 12.12.2016 um 09:34 schrieb Chris Packham: >> Teach 'git merge' the --continue option which allows 'continuing' a >> merge by completing it. The traditional way of completing a merge after >> resolving conflicts is to use 'git commit'. No

Re: [RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit'

2016-12-12 Thread Jeff King
On Mon, Dec 12, 2016 at 09:34:13PM +1300, Chris Packham wrote: > Teach 'git merge' the --continue option which allows 'continuing' a > merge by completing it. The traditional way of completing a merge after > resolving conflicts is to use 'git commit'. Now with commands like 'git > rebase' and 'gi

Re: [RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit'

2016-12-12 Thread Markus Hitter
Am 12.12.2016 um 09:34 schrieb Chris Packham: > Teach 'git merge' the --continue option which allows 'continuing' a > merge by completing it. The traditional way of completing a merge after > resolving conflicts is to use 'git commit'. Now with commands like 'git > rebase' and 'git cherry-pick' hav

[RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit'

2016-12-12 Thread Chris Packham
Teach 'git merge' the --continue option which allows 'continuing' a merge by completing it. The traditional way of completing a merge after resolving conflicts is to use 'git commit'. Now with commands like 'git rebase' and 'git cherry-pick' having a '--continue' option adding such an option to 'gi