Re: [PATCH 1/1] pull --rebase=: allow single-letter abbreviations for the type

2018-08-08 Thread Junio C Hamano
Junio C Hamano writes: > Ævar Arnfjörð Bjarmason writes: > >>> - else if (!strcmp(value, "preserve")) >>> + else if (!strcmp(value, "preserve") || !strcmp(value, "p")) >>> return REBASE_PRESERVE; >>> - else if (!strcmp(value, "merges")) >>> + else if (!strcmp(value,

Re: [PATCH 1/1] pull --rebase=: allow single-letter abbreviations for the type

2018-08-08 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> -else if (!strcmp(value, "preserve")) >> +else if (!strcmp(value, "preserve") || !strcmp(value, "p")) >> return REBASE_PRESERVE; >> -else if (!strcmp(value, "merges")) >> +else if (!strcmp(value, "merges") || !strcmp(value, "m")) >>

Re: [PATCH 1/1] pull --rebase=: allow single-letter abbreviations for the type

2018-08-07 Thread Ævar Arnfjörð Bjarmason
On Sat, Aug 04 2018, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle > --rebase=interactive, 2011-10-21) had support for the very convenient > abbreviation > > git pull --rebase=i > > which was

Re: [PATCH 1/1] pull --rebase=: allow single-letter abbreviations for the type

2018-08-07 Thread Johannes Schindelin
Hi Junio, On Mon, 6 Aug 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > From: Johannes Schindelin > > > > Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle > > --rebase=interactive, 2011-10-21) had support for the very convenient > >

Re: [PATCH 1/1] pull --rebase=: allow single-letter abbreviations for the type

2018-08-06 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle > --rebase=interactive, 2011-10-21) had support for the very convenient > abbreviation > > git pull --rebase=i > > which was later lost when it

[PATCH 1/1] pull --rebase=: allow single-letter abbreviations for the type

2018-08-04 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle --rebase=interactive, 2011-10-21) had support for the very convenient abbreviation git pull --rebase=i which was later lost when it was ported to the builtin `git pull`, and it was not