Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

2017-08-22 Thread Junio C Hamano
hIpPy writes: > I think 'git merge --continue' should be advertised more that 'git > commit' as typically one is familiar with 'git rebase --continue' and > 'git cherry-pick --continue'. I for a long time did not know I could > also use 'git commit' to continue a merge but that's just me. Perhap

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

2017-08-22 Thread hIpPy
I think 'git merge --continue' should be advertised more that 'git commit' as typically one is familiar with 'git rebase --continue' and 'git cherry-pick --continue'. I for a long time did not know I could also use 'git commit' to continue a merge but that's just me. Now, 'git commit' is easier to

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

2017-08-22 Thread Martin Ågren
On 22 August 2017 at 11:26, Michael J Gruber wrote: > Martin Ågren venit, vidit, dixit 21.08.2017 18:43: >> On 21 August 2017 at 14:53, Michael J Gruber wrote: >>> Currently, 'git merge --continue' is mentioned but not explained. >>> >>> Explain it. >>> >>> Signed-off-by: Michael J Gruber >>> --

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

2017-08-22 Thread Michael J Gruber
Martin Ågren venit, vidit, dixit 21.08.2017 18:43: > On 21 August 2017 at 14:53, Michael J Gruber wrote: >> Currently, 'git merge --continue' is mentioned but not explained. >> >> Explain it. >> >> Signed-off-by: Michael J Gruber >> --- >> Documentation/git-merge.txt | 5 - >> 1 file changed

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

2017-08-21 Thread Junio C Hamano
Michael J Gruber writes: > Currently, 'git merge --continue' is mentioned but not explained. > > Explain it. > > Signed-off-by: Michael J Gruber > --- > Documentation/git-merge.txt | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-merge.txt b/Documen

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

2017-08-21 Thread Martin Ågren
On 21 August 2017 at 14:53, Michael J Gruber wrote: > Currently, 'git merge --continue' is mentioned but not explained. > > Explain it. > > Signed-off-by: Michael J Gruber > --- > Documentation/git-merge.txt | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/Documentati

[PATCH v2 1/3] Documentation/git-merge: explain --continue

2017-08-21 Thread Michael J Gruber
Currently, 'git merge --continue' is mentioned but not explained. Explain it. Signed-off-by: Michael J Gruber --- Documentation/git-merge.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 6b308ab6d0..615e6