Re: [PATCH 5/5] sequencer: do not invent whitespace when transforming OIDs

Hi Johannes, On 23 December 2017 at 00:56, Johannes Schindelin wrote: > For commands that do not have an argument, there is no need to append a > trailing space at the end of the line. > > Signed-off-by: Johannes Schindelin > --- >

Re: [PATCH v2 8/9] rebase -i: learn to abbreviate command names

Hi Junio, On 27 December 2017 at 20:15, Junio C Hamano <gits...@pobox.com> wrote: > Duy Nguyen <pclo...@gmail.com> writes: > >> On Mon, Dec 4, 2017 at 5:17 AM, Liam Beguin <liambeg...@gmail.com> wrote: >>> +static const char command_

Re: [PATCH v2 8/9] rebase -i: learn to abbreviate command names

Hi Duy, On Mon, 25 Dec 2017 at 07:48 Duy Nguyen <pclo...@gmail.com> wrote: > > On Mon, Dec 4, 2017 at 5:17 AM, Liam Beguin <liambeg...@gmail.com> wrote: > > +static const char command_to_char(const enum todo_command command) > > +{ > > + if (command

Re: [PATCH v2 0/9] rebase -i: add config to abbreviate command names

On 05/12/17 05:21 PM, Junio C Hamano wrote: > Liam Beguin <liambeg...@gmail.com> writes: > >> This series will add the 'rebase.abbreviateCommands' configuration >> option to allow `git rebase -i` to default to the single-letter command >> names when generating the

[PATCH v3 9/9] t3404: add test case for abbreviated commands

Make sure the todo list ends up using single-letter command abbreviations when the rebase.abbreviateCommands is enabled. This configuration option should not change anything else. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- t/t3404-rebase-interactive.sh | 22 +++

[PATCH v3 5/9] rebase -i: replace reference to sha1 with oid

Since we are trying to abstract the hash function name elsewhere in the code base, lets use OID instead of SHA-1 in the rebase--helper too. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- builtin/rebase--helper.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff

[PATCH v2 0/9] rebase -i: add config to abbreviate command names

rewriting it - Make 'command_to_char' return 'comment_char_line' if no single-letter command name is defined - Combine both tests into a single test case - Update commit messages Changes in V2: - Rename 'transform_todo_insn' to 'transform_todos' - Fix flag name TODO_LIST_SHORTE{D,N}_IDS Liam Beguin (9):

[PATCH v3 6/9] rebase -i: update functions to use a flags parameter

Update functions used in the rebase--helper so that they take a generic 'flags' parameter instead of a growing list of options. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- builtin/rebase--helper.c | 13 +++-- sequencer.c | 9 + seque

[PATCH v3 7/9] rebase -i -x: add exec commands via the rebase--helper

Recent work on `git-rebase--interactive` aims to convert shell code to C. Even if this is most likely not a big performance enhancement, let's convert it too since a coming change to abbreviate command names requires it to be updated. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- b

[PATCH v3 4/9] rebase -i: refactor transform_todo_ids

The transform_todo_ids function is a little hard to read. Lets try to make it easier by using more of the strbuf API. Also, since we'll soon be adding command abbreviations, let's rename the function so it's name reflects that change. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- b

[PATCH v3 2/9] Documentation: use preferred name for the 'todo list' script

Use "todo list" instead of "instruction list" or "todo-list" to reduce further confusion regarding the name of this script. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/rebase-config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 dele

[PATCH v3 8/9] rebase -i: learn to abbreviate command names

`git rebase -i` already know how to interpret single-letter command names. Teach it to generate the todo list with these same abbreviated names. Based-on-patch-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Document

[PATCH v3 1/9] Documentation: move rebase.* configs to new file

Move all rebase.* configuration variables to a separate file in order to remove duplicates, and include it in config.txt and git-rebase.txt. The new descriptions are mostly taken from config.txt as they are more verbose. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documen

[PATCH v3 3/9] rebase -i: set commit to null in exec commands

Make sure commit is set to NULL when parsing exec instructions from the todo list. If not, we may try to access an uninitialized address later while updating the todo list. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- sequencer.c | 1 + 1 file changed, 1 insertion(+) diff

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

Hi, On 05/12/17 07:41 AM, Kerry, Richard wrote: > > "Shorted" is what happens when you put a piece of wire across the terminals > of a battery ... (bang, smoke, etc). > It's short for "short-circuited". > Yes, I think you mean "shortened" in this case. > Thanks for the explanation. Sorry, my

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

Hi Johannes, On 04/12/17 10:46 AM, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 3 Dec 2017, Liam Beguin wrote: > >> diff --git a/sequencer.h b/sequencer.h >> index 4e444e3bf1c4..3bb6b0658192 100644 >> --- a/sequencer.h >> +++ b/sequencer.h >>

Re: [PATCH v2 4/9] rebase -i: refactor transform_todo_ids

Hi Johannes, On 04/12/17 09:42 AM, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 3 Dec 2017, Liam Beguin wrote: > >> The transform_todo_ids function is a little hard to read. Lets try >> to make it easier by using more of the strbuf API. Also, since we'll &

Re: [PATCH v2 4/9] rebase -i: refactor transform_todo_ids

Hi Junio, On 04/12/17 11:09 AM, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > >> On Sun, 3 Dec 2017, Liam Beguin wrote: >> >>> The transform_todo_ids function is a little hard to read. Lets try >>> to make it ea

[PATCH v2 9/9] t3404: add test case for abbreviated commands

Make sure the todo list ends up using single-letter command abbreviations when the rebase.abbreviateCommands is enabled. This configuration option should not change anything else. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- t/t3404-rebase-interactive.sh | 22 +++

[PATCH v2 6/9] rebase -i: update functions to use a flags parameter

Update functions used in the rebase--helper so that they take a generic 'flags' parameter instead of a growing list of options. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- builtin/rebase--helper.c | 13 +++-- sequencer.c | 9 + seque

[PATCH v2 3/9] rebase -i: set commit to null in exec commands

Make sure commit is set to NULL when parsing exec instructions from the todo list. If not, we may try to access an uninitialized address later while updating the todo list. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- sequencer.c | 1 + 1 file changed, 1 insertion(+) diff

[PATCH v2 8/9] rebase -i: learn to abbreviate command names

`git rebase -i` already know how to interpret single-letter command names. Teach it to generate the todo list with these same abbreviated names. Based-on-patch-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Document

[PATCH v2 4/9] rebase -i: refactor transform_todo_ids

The transform_todo_ids function is a little hard to read. Lets try to make it easier by using more of the strbuf API. Also, since we'll soon be adding command abbreviations, let's rename the function so it's name reflects that change. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- b

[PATCH v2 7/9] rebase -i -x: add exec commands via the rebase--helper

Recent work on `git-rebase--interactive` aims to convert shell code to C. Even if this is most likely not a big performance enhancement, let's convert it too since a coming change to abbreviate command names requires it to be updated. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- b

[PATCH v2 0/9] rebase -i: add config to abbreviate command names

rewriting it - Make 'command_to_char' return 'comment_char_line' if no single-letter command name is defined - Combine both tests into a single test case - Update commit messages Liam Beguin (9): Documentation: move rebase.* configs to new file Documentation: use preferred name for the 'todo list' scr

[PATCH v2 1/9] Documentation: move rebase.* configs to new file

Move all rebase.* configuration variables to a separate file in order to remove duplicates, and include it in config.txt and git-rebase.txt. The new descriptions are mostly taken from config.txt as they are more verbose. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documen

[PATCH v2 2/9] Documentation: use preferred name for the 'todo list' script

Use "todo list" instead of "instruction list" or "todo-list" to reduce further confusion regarding the name of this script. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/rebase-config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 dele

[PATCH v2 5/9] rebase -i: replace reference to sha1 with oid

Since we are trying to abstract the hash function name elsewhere in the code base, lets use OID instead of SHA-1 in the rebase--helper too. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- builtin/rebase--helper.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

Hi Johannes, On 27/11/17 06:04 PM, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 26 Nov 2017, Liam Beguin wrote: > >> diff --git a/Documentation/rebase-config.txt >> b/Documentation/rebase-config.txt >> index 30ae08cb5a4b..0820b60f6e12 100644 >> -

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

Hi Peff, Thanks for taking the time to test this, I'll squash that patch in v2. On 27/11/17 06:11 PM, Jeff King wrote: > On Tue, Nov 28, 2017 at 12:04:45AM +0100, Johannes Schindelin wrote: > >>> +rebase.abbreviateCommands:: >>> + If set to true, `git rebase` will use abbreviated command

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

Hi Junio, On 27/11/17 12:19 AM, Junio C Hamano wrote: > Liam Beguin <liambeg...@gmail.com> writes: > >> if (command == MAKE_SCRIPT && argc > 1) >> -return !!sequencer_make_script(keep_empty, stdout, argc, argv); >> +

Re: [PATCH 3/5] rebase -i: add exec commands via the rebase--helper

ouches already > from the concise graph output I favor). Sure, I'll update the commit subject. > > On Sun, 26 Nov 2017, Liam Beguin wrote: > >> Recent work on `git-rebase--interactive` aim to convert shell code to C. >> Even if this is most likely not a big performance enhace

Re: [PATCH 3/5] rebase -i: add exec commands via the rebase--helper

Hi Junio, On 27/11/17 12:14 AM, Junio C Hamano wrote: > Liam Beguin <liambeg...@gmail.com> writes: > >> diff --git a/sequencer.c b/sequencer.c >> index fa94ed652d2c..810b7850748e 100644 >> --- a/sequencer.c >> +++ b/sequencer.c >> @@ -2492,6 +2492,52 @

Re: [PATCH 0/5] rebase -i: add config to abbreviate command names

Hi Junio, On 27/11/17 12:23 AM, Junio C Hamano wrote: > Liam Beguin <liambeg...@gmail.com> writes: > >> Liam Beguin (5): >> Documentation: move rebase.* configs to new file >> Documentation: use preferred name for the 'todo list' script >> rebase

[PATCH 0/5] rebase -i: add config to abbreviate command names

o-]autosquash option in rebase.autoSquash - Add exec commands via the rebase--helper - Add test case for rebase.abbreviateCommands Liam Beguin (5): Documentation: move rebase.* configs to new file Documentation: use preferred name for the 'todo list' script rebase -i: add exec commands via the reb

[PATCH 3/5] rebase -i: add exec commands via the rebase--helper

Recent work on `git-rebase--interactive` aim to convert shell code to C. Even if this is most likely not a big performance enhacement, let's convert it too since a comming change to abbreviate command names requires it to be updated. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- b

[PATCH 4/5] rebase -i: learn to abbreviate command names

`git rebase -i` already know how to interpret single-letter command names. Teach it to generate the todo list with these same abbreviated names. Based-on-patch-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Document

[PATCH 5/5] t3404: add test case for abbreviated commands

Make sure the todo list ends up using single-letter command abbreviations when the rebase.abbreviateCommands is enabled. This configuration options should not change anything else. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- t/t3404-rebase-interactive.s

[PATCH 1/5] Documentation: move rebase.* configs to new file

Move all rebase.* configuration variables to a separate file in order to remove duplicates, and include it in config.txt and git-rebase.txt. The new descriptions are mostly taken from config.txt as they are more verbose. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documen

[PATCH 2/5] Documentation: use preferred name for the 'todo list' script

Use "todo list" instead of "instruction list" or "todo-list" to reduce further confusion regarding the name of this script. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/rebase-config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 dele

Re: [PATCH v5 08/10] rebase -i: skip unnecessary picks using the rebase--helper

On 19/06/17 05:45 AM, Johannes Schindelin wrote: > Hi Liam, > > On Sat, 17 Jun 2017, Liam Beguin wrote: > >> On 16/06/17 09:56 AM, Johannes Schindelin wrote: >> >>> On Thu, 15 Jun 2017, Liam Beguin wrote: >>> >>>> On 14/06/17 09:08 AM, Joh

Re: [PATCH v5 08/10] rebase -i: skip unnecessary picks using the rebase--helper

Hi Johannes, On 16/06/17 09:56 AM, Johannes Schindelin wrote: > Hi Liam, > > On Thu, 15 Jun 2017, Liam Beguin wrote: > >> On 14/06/17 09:08 AM, Johannes Schindelin wrote: >>> diff --git a/sequencer.c b/sequencer.c >>> index a697906d463..a0e020dab09 10

[PATCH v2 1/3] stash: update documentation to use 'stash entry'

Most of the time, a 'stash entry' is called a 'stash'. Lets try to make this more consistent and use 'stash entry' instead. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/config.txt | 6 ++--- Documentation/git-pull.txt | 2 +- Documentation/git-rebase.tx

[PATCH v2 2/3] status: add optional stash count information

Introduce '--show-stash' and its configuration option 'status.showStash' to allow git-status to show information about currently stashed entries. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/config.txt | 5 + Documentation/git-status.txt | 3 +++ builtin/co

[PATCH v2 3/3] glossary: define 'stash entry'

Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/glossary-content.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 6e991c246915..b71b943b12ed 100644 --- a/Documentation/gl

[PATCH v2 0/3] add stash count information to git-status command

+fdgzk5ahxw+hq_y_czmx9x6mxybcr9wspe...@mail.gmail.com/ Liam Beguin (3): stash: update documentation to use 'stash entry' status: add optional stash count information glossary: define 'stash entry' Documentation/config.txt | 11 +-- Documentation/git-pull.txt | 2

Re: [PATCH 0/3] add stash count information to git-status command

Hi, On 16/06/17 08:16 AM, Jeff King wrote: > On Fri, Jun 16, 2017 at 12:30:47AM -0400, Liam Beguin wrote: > >> As discussed here [*1*], this allows `git status` to show the number of >> entries currently stashed away. >> >> I also tried to update the related par

[PATCH 1/3] stash: update documentation to use 'stash entries'

Most of the time, a 'stash entry' is called a 'stash' or a 'stash state'. Lets use 'stash entry' instead. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/config.txt | 6 +++--- Documentation/git-pull.txt | 2 +- Documentation/git-rebase.txt | 2 +- Documentati

[PATCH 2/3] wt-status: add optional stash status information

Add the `status.showStash` configuration option to allow git-status to show information about currently stashed entries. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/config.txt | 5 + wt-status.c | 24 2 files chang

[PATCH 3/3] glossary: define stash entries

Add glossary entry for "stash entries". Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/glossary-content.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 6e991c2469

[PATCH 0/3] add stash count information to git-status command

and using something like "You have %d stash/stashes" in the status message if it makes the change "too big". *1* https://public-inbox.org/git/ca+b9myhrahtd+fdgzk5ahxw+hq_y_czmx9x6mxybcr9wspe...@mail.gmail.com/ Liam Beguin (3): stash: update documentation to use 'stash entri

Re: [PATCH v5 08/10] rebase -i: skip unnecessary picks using the rebase--helper

Hi, On 14/06/17 09:08 AM, Johannes Schindelin wrote: > diff --git a/sequencer.c b/sequencer.c > index a697906d463..a0e020dab09 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -2640,3 +2640,110 @@ int check_todo_list(void) > > return res; > } > + > +/* skip picking commits whose

Re: Feature Request: Show status of the stash in git status command

Hi, On 13/06/17 02:42 AM, Konstantin Khomoutov wrote: > On Mon, Jun 12, 2017 at 11:42:44PM -0400, liam Beguin wrote: > > [...] >>> Conceptually, the contents of the stash are *not* commits, even >>> though the implementation happens to use a commit to represent eac

Re: Feature Request: Show status of the stash in git status command

Hi, Thanks for the feedback. I'll be sending a patch with the updates shortly! On 12/06/17 11:35 AM, Junio C Hamano wrote: > liam Beguin <liambeg...@gmail.com> writes: > >> +static int stash_count_refs(struct object_id *ooid, struct object_id *noid, >> +

Re: Feature Request: Show status of the stash in git status command

Hi, As it looks like something easy enough for a beginner, I though I could give it a try. Here is what it looks like. If it's good enough, I'll add a few lines to document 'status.showStash' and send a patch. There is one thing I've noticed though. When using 'git stash pop', it shows the the

Re: [PATCH v4 02/10] rebase -i: generate the script via rebase--helper

Hi Johannes, Johannes Schindelin writes: > The first step of an interactive rebase is to generate the so-called "todo > script", to be stored in the state directory as "git-rebase-todo" and to > be edited by the user. > > Originally, we adjusted the output of `git log

Re: [PATCH v4 02/10] rebase -i: generate the script via rebase--helper

Hi Johannes, On 29/05/17 06:59 AM, Johannes Schindelin wrote: > Hi Liam, > > On Thu, 25 May 2017, Liam Beguin wrote: > >> Johannes Schindelin <johannes.schinde...@gmx.de> writes: >> >>> diff --git a/sequencer.c b/sequencer.c >>> index 130cc

Re: [PATCH v4 03/10] rebase -i: remove useless indentation

Hi Stefan, On 26/05/17 01:50 PM, Stefan Beller wrote: > On Thu, May 25, 2017 at 8:15 PM, Liam Beguin <liambeg...@gmail.com> wrote: >> Hi Johannes, >> >> Johannes Schindelin <johannes.schinde...@gmx.de> writes: >>> The commands used to be indent

[PATCH v4 10/10] rebase -i: rearrange fixup/squash lines using the rebase--helper

Hi Johannes, Johannes Schindelin writes: > This operation has quadratic complexity, which is especially painful > on Windows, where shell scripts are *already* slow (mainly due to the > overhead of the POSIX emulation layer). > > Let's reimplement this with linear

[PATCH v4 03/10] rebase -i: remove useless indentation

Hi Johannes, Johannes Schindelin writes: > The commands used to be indented, and it is nice to look at, but when we > transform the SHA-1s, the indentation is removed. So let's do away with it. > > For the moment, at least: when we will use the upcoming

[PATCH v4 05/10] rebase -i: also expand/collapse the SHA-1s via the rebase--helper

Hi Johannes, Johannes Schindelin writes: > This is crucial to improve performance on Windows, as the speed is now > mostly dominated by the SHA-1 transformation (because it spawns a new > rev-parse process for *every* line, and spawning processes is pretty > slow from

[PATCH v4 02/10] rebase -i: generate the script via rebase--helper

Hi Johannes, Johannes Schindelin writes: > The first step of an interactive rebase is to generate the so-called "todo > script", to be stored in the state directory as "git-rebase-todo" and to > be edited by the user. > > Originally, we adjusted the output of `git

[PATCH v4 00/10] The final building block for a faster rebase -i

Hi Johannes, Johannes Schindelin writes: > This patch series reimplements the expensive pre- and post-processing of > the todo script in C. > > And it concludes the work I did to accelerate rebase -i. > > Changes since v3: > > - removed the no-longer-used

Re: [PATCH v3 0/6] rebase -i: add config to abbreviate command-names

Hi, On Mon, 2017-05-08 at 09:27 +0900, Junio C Hamano wrote: > Liam Beguin <liambeg...@gmail.com> writes: > > > Sorry for the delay, I don't mind switching to C but it would probably > > be easier to see if the scripted version gets approved first. > > If it

Re: [PATCH v3 0/6] rebase -i: add config to abbreviate command-names

Hi Junio, On Wed, 2017-05-03 at 22:04 -0700, Junio C Hamano wrote: > Johannes Schindelin writes: > > > > If 'git-rebase--interactive.sh' is bound to be replaced, I could > > > just shrink this to the Documentation cleanup (patches 4 and 5) > > > and rework the rest

Re: [PATCH v3 0/6] rebase -i: add config to abbreviate command-names

Hi Johannes, On Tue, 2017-05-02 at 17:48 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Tue, 2 May 2017, Liam Beguin wrote: > > > Add the 'rebase.abbreviateCommands' configuration option to allow `git > > rebase -i` to default to the single-letter command-na

Re: [PATCH v3 3/6] rebase -i: add short command-name in --autosquash

Hi Johannes, On Tue, 2017-05-02 at 17:34 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Tue, 2 May 2017, Liam Beguin wrote: > > > teach `git rebase -i` to recognise short command-names when using the > > '--autosquash' option. This allows commit with titl

[PATCH v3 3/6] rebase -i: add short command-name in --autosquash

teach `git rebase -i` to recognise short command-names when using the '--autosquash' option. This allows commit with titles beginning with "s! ..." and "f! ..." to be treated the same way as "squash! ..." and "fixup! ..." respectively. Signed-o

[PATCH v3 0/6] rebase -i: add config to abbreviate command-names

Documentation/rebase-config.txt - update Documentation to use the preferred naming for the todo list - update Documentation and commit messages according to feedback Liam Beguin (6): rebase -i: add abbreviated command-names handling rebase -i: add abbreviate_commands function rebase -i: ad

[PATCH v3 1/6] rebase -i: add abbreviated command-names handling

make sure 'add_exec_commands' and 'transform_todo_ids' also understand the abbreviated versions of the command-names. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- git-rebase--interactive.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-

[PATCH v3 2/6] rebase -i: add abbreviate_commands function

Once the rest of the processing is done, the `abbreviate_commands` function is called. If the 'rebase.abbreviateCommands' option is set to true, the function will replace each command-name by its abbreviated form. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- git-rebase--interact

[PATCH v3 4/6] Documentation: move rebase.* config variables to a separate rebase-config.txt

Move configuration variables to a separate file in order to remove duplicates, and include it in config.txt and git-rebase.txt. The new descriptions are taken from config.txt as they are more verbose. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/config.txt

[PATCH v3 5/6] Documentation: use preferred name for the 'todo list' script

Use "todo list" instead of "instruction list" or "todo-list" to reduce further confusion regarding the name of this script. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/rebase-config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 dele

[PATCH v3 6/6] Documentation: document the rebase.abbreviateCommands option

Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Documentation/rebase-config.txt | 23 +++ 1 file changed, 23 insertions(+) diff --git a/Documentation/rebase-config.txt b/Documentation/rebase-config.txt index a9b1d496e63a..0f29b7d0b89a 100644 --- a/Documentation/

Re: [PATCH v2] rebase -i: add config to abbreviate command-names

Hi Ævar, On Wed, 2017-04-26 at 17:24 +0200, Ævar Arnfjörð Bjarmason wrote: > On Tue, Apr 25, 2017 at 6:43 AM, Liam Beguin <liambeg...@gmail.com> wrote: > > Add the 'rebase.abbrevCmd' boolean config option to allow `git rebase -i` > > to abbreviate the command-names in

Re: [PATCH v2] rebase -i: add config to abbreviate command-names

Hi Johannes, On Tue, 2017-04-25 at 22:08 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Tue, 25 Apr 2017, Liam Beguin wrote: > > > Add the 'rebase.abbrevCmd' boolean config option to allow `git rebase -i` > > to abbreviate the command-names in the instruction l

Re: [PATCH v2] rebase -i: add config to abbreviate command-names

Hi Jake, On Tue, 2017-04-25 at 01:29 -0700, Jacob Keller wrote: > On Mon, Apr 24, 2017 at 11:29 PM, Junio C Hamano wrote: > > Personally I am happy with the beginning of each instruction line > > aligned, so from that point of view, this patch is a mild Meh to me, > > even

Re: [PATCH] rebase -i: add config to abbreviate command name

Hi Johannes, On Tue, 2017-04-25 at 21:45 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Mon, 24 Apr 2017, liam BEGUIN wrote: > > > On Mon, 2017-04-24 at 12:26 +0200, Johannes Schindelin wrote: > > > > > On Sun, 23 Apr 2017, Liam Beguin wrote: > &g

Re: [PATCH v2] rebase -i: add config to abbreviate command-names

Hi Johannes, On Tue, 2017-04-25 at 23:23 +0200, Johannes Schindelin wrote: > Hi Andreas, > > On Tue, 25 Apr 2017, Andreas Schwab wrote: > > > On Apr 25 2017, Liam Beguin <liambeg...@gmail.com> wrote: > > > > > diff --git a/Documentation/config.txt

[PATCH v2] rebase -i: add config to abbreviate command-names

a single character command-name allows the lines to remain aligned, making the whole set more readable. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Changes since v1: - Improve Documentation and commit message Documentation/config.txt | 19 +++ Documentati

[PATCH v2] rebase -i: add config to abbreviate command-names

a single character command-name allows the lines to remain aligned, making the whole set more readable. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Changes since v1: - Improve Documentation and commit message Documentation/config.txt | 19 +++ Documentati

Re: [PATCH] rebase -i: add config to abbreviate command name

Hi Johannes, On Mon, 2017-04-24 at 12:26 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 23 Apr 2017, Liam Beguin wrote: > > > Add the 'rebase.abbrevCmd' boolean config option to allow > > the user to abbreviate the default command name while editing > &

Re: [PATCH] rebase -i: add config to abbreviate command name

Hi, On Mon, 2017-04-24 at 12:26 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 23 Apr 2017, Liam Beguin wrote: > > > Add the 'rebase.abbrevCmd' boolean config option to allow > > the user to abbreviate the default command name while editing > &

[PATCH] rebase -i: add config to abbreviate command name

Add the 'rebase.abbrevCmd' boolean config option to allow the user to abbreviate the default command name while editing the 'git-rebase-todo' file. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- Notes: * This allows the lines to remain aligned when using single letter co