Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-29 Thread Junio C Hamano
Remi Galan Alfonso writes: > At first we wanted a clear indication about removing a commit in > rebase -i. We didn't know about the noop command. > - 'noop' does the same thing as 'drop' but for the user deleting a >commit through 'noop' doesn't seem to be the proper way to use this >com

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-29 Thread Remi Galan Alfonso
At first we wanted a clear indication about removing a commit in rebase -i. We didn't know about the noop command. - 'noop' does the same thing as 'drop' but for the user deleting a commit through 'noop' doesn't seem to be the proper way to use this command. Moreover 'noop' is not documented

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-28 Thread Matthieu Moy
Johannes Schindelin writes: > Hi Stefan, > > On 2015-05-27 23:47, Stefan Beller wrote: >> On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano wrote: >> Talking about ideas: >> I sometimes have the wrong branch checked out when doing a small >> fixup commit. So I want to drop that patch from the curr

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-28 Thread Stefan Beller
On Thu, May 28, 2015 at 10:06 AM, Johannes Schindelin wrote: > Hi Stefan, > > On 2015-05-27 23:47, Stefan Beller wrote: >> On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano wrote: >> Talking about ideas: >> I sometimes have the wrong branch checked out when doing a small >> fixup commit. So I want

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-28 Thread Johannes Schindelin
Hi Stefan, On 2015-05-27 23:47, Stefan Beller wrote: > On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano wrote: > Talking about ideas: > I sometimes have the wrong branch checked out when doing a small > fixup commit. So I want to drop that patch from the current branch > and apply it to another br

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-27 Thread Philip Oakley
From: "Junio C Hamano" Matthieu Moy writes: I find it weird to write noop True, but then it can be spelled # too, so do we still want 'drop'? Unless we have a strong reason to believe migrants from Hg cannot be (re)trained, personally, I'd feel that we do not need this 'drop' thi

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-27 Thread Stefan Beller
On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano wrote: > Matthieu Moy writes: > >> Junio C Hamano writes: >> >>> Matthieu Moy writes: >>> I find it weird to write noop >>> >>> True, but then it can be spelled >>> >>> # >> >> I do find it weird too. "#" means "comment", wh

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-27 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> Matthieu Moy writes: >> >>> I find it weird to write >>> >>> noop >> >> True, but then it can be spelled >> >> # > > I do find it weird too. "#" means "comment", which means "do as if it > was not there" to me. And in this case it does

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-27 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> I find it weird to write >> >> noop > > True, but then it can be spelled > > # I do find it weird too. "#" means "comment", which means "do as if it was not there" to me. And in this case it does change the semantics once you activate t

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-27 Thread Junio C Hamano
Matthieu Moy writes: > I find it weird to write > > noop True, but then it can be spelled # too, so do we still want 'drop'? Unless we have a strong reason to believe migrants from Hg cannot be (re)trained, personally, I'd feel that we do not need this 'drop' thing. -- To unsubscribe

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-27 Thread Matthieu Moy
Remi Galan Alfonso writes: > It also has some effects with the second part of this patch (checks > removed and/or duplicated commits): if you comment the line, the > commit will be considered as removed, thus ending in a warning if the > config variable is set to warn/error; however this problem

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-27 Thread Remi Galan Alfonso
Thank you for reviewing the code. Johannes Schindelin writes: > Please note that you can already just comment-out the line if you need to > keep a visual trace. > > Alternatively, you can replace the `pick` command by `noop`. > > If you really need the `drop` command (with which I am not 100% >

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-26 Thread Johannes Schindelin
Hi Rémi, On 2015-05-26 23:38, Galan Rémi wrote: > Instead of removing a line to remove the commit, you can use the key > word "drop" (just like "pick" or "edit"). It has the same effect as > deleting the line (removing the commit) except that you keep a visual > trace of your actions, allowing a b

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-26 Thread Eric Sunshine
On Tue, May 26, 2015 at 5:38 PM, Galan Rémi wrote: > git-rebase -i: Add key word "drop" to remove a commit "key word" is unusual. More typical is "keyword". However, perhaps "command" might be even better. Also, custom on this project is not to capitalize, so: git-rebase -i: add command "dro

[PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

2015-05-26 Thread Galan Rémi
Instead of removing a line to remove the commit, you can use the key word "drop" (just like "pick" or "edit"). It has the same effect as deleting the line (removing the commit) except that you keep a visual trace of your actions, allowing a better control and reducing the possibility of removing a