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

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 remi.galan-alfo...@ensimag.grenoble-inp.fr 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

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 gits...@pobox.com 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

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 johannes.schinde...@gmx.de wrote: Hi Stefan, On 2015-05-27 23:47, Stefan Beller wrote: On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com wrote: Talking about ideas: I sometimes have the wrong branch checked out when doing

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

2015-05-28 Thread Matthieu Moy
Johannes Schindelin johannes.schinde...@gmx.de writes: Hi Stefan, On 2015-05-27 23:47, Stefan Beller wrote: On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com 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-27 Thread Remi Galan Alfonso
Thank you for reviewing the code. Johannes Schindelinjohannes.schinde...@gmx.de 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

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 remi.galan-alfo...@ensimag.grenoble-inp.fr 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

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 matthieu@grenoble-inp.fr writes: I find it weird to write noop sha1 title True, but then it can be spelled # sha1 title 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

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 gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: I find it weird to write noop sha1 title True, but then it can be spelled # sha1 title I do find it weird too. # means comment, which means do as if it was not there to me. And in this case it

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 matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: I find it weird to write noop sha1 title True, but then it can be spelled # sha1 title I do find it weird too. # means comment, which means

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

2015-05-27 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 better

[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

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 remi.galan-alfo...@ensimag.grenoble-inp.fr 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: