Re: [PATCH] rebase docs: drop stray word in merge command description

2018-12-10 Thread Johannes Schindelin
Hi Junio, On Mon, 10 Dec 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Hi Kyle, > > > > On Sat, 8 Dec 2018, Kyle Meyer wrote: > > > >> Delete a misplaced word introduced by caafecfcf1 (rebase > >> --rebase-merges: adjust man page for octopus support, 2018-03-09). > >> > >> Si

Re: [PATCH] rebase docs: drop stray word in merge command description

2018-12-09 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Kyle, > > On Sat, 8 Dec 2018, Kyle Meyer wrote: > >> Delete a misplaced word introduced by caafecfcf1 (rebase >> --rebase-merges: adjust man page for octopus support, 2018-03-09). >> >> Signed-off-by: Kyle Meyer > > ACK. Thanks. > Too bad this did not make it

Re: [PATCH] rebase docs: drop stray word in merge command description

2018-12-09 Thread Johannes Schindelin
Hi Kyle, On Sat, 8 Dec 2018, Kyle Meyer wrote: > Delete a misplaced word introduced by caafecfcf1 (rebase > --rebase-merges: adjust man page for octopus support, 2018-03-09). > > Signed-off-by: Kyle Meyer ACK. Too bad this did not make it into v2.20.0, but at least it can make it into a futur

[PATCH] rebase docs: drop stray word in merge command description

2018-12-08 Thread Kyle Meyer
Delete a misplaced word introduced by caafecfcf1 (rebase --rebase-merges: adjust man page for octopus support, 2018-03-09). Signed-off-by: Kyle Meyer --- Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/