Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

On Mon, Jun 22, 2015 at 5:42 PM, Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: Instead of removing a line to remove the commit, you can use the command drop (just like pick or edit). It has the same effect as deleting the line (removing the commit) except that you keep a visual

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Eric Sunshine sunsh...@sunshineco.com writes: +test_rebase_end () { + test_when_finished git checkout master + git branch -D $1 + test_might_fail git rebase --abort + git checkout -b $1 master +} The way this is indented makes it difficult to see that

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr writes: +test_rebase_end () { + test_when_finished git checkout master + git branch -D $1 Is this one guaranteed to succeed? Do we want to consider it a failure to remove $1 (e.g. dropTest)? $ git branch -D no-such-branch

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Matthieu Moy matthieu@grenoble-inp.fr writes: Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes: Eric Sunshine sunsh...@sunshineco.com writes: +test_rebase_end () { + test_when_finished git checkout master + git branch -D $1 +

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes: Eric Sunshine sunsh...@sunshineco.com writes: +test_rebase_end () { + test_when_finished git checkout master + git branch -D $1 + test_might_fail git rebase --abort + git checkout -b $1

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

On Tue, Jun 23, 2015 at 3:01 PM, Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: Eric Sunshine sunsh...@sunshineco.com writes: +test_rebase_end () { + test_when_finished git checkout master + git branch -D $1 + test_might_fail git rebase --abort

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Matthieu Moy matthieu@grenoble-inp.fr writes: Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes: I think that the indentation on its own is enough to avoid confusion test_rebase_end () { test_when_finished git checkout master git branch -D $1

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes: I think that the indentation on its own is enough to avoid confusion test_rebase_end () { test_when_finished git

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Junio C Hamano gits...@pobox.com writes: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr writes: +test_rebase_end () { +test_when_finished git checkout master +git branch -D $1 Is this one guaranteed to succeed? Do we want to consider it a failure to remove $1 (e.g.

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Junio C Hamano gits...@pobox.com writes: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr writes: +test_rebase_end () { +test_when_finished git checkout master +git branch -D $1 Is this one guaranteed to succeed? Do we want to consider it a failure to

Re: [PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes: I think that the indentation on its own is enough to avoid confusion test_rebase_end () { test_when_finished git checkout master git branch -D $1 test_might_fail git rebase --abort

[PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

Instead of removing a line to remove the commit, you can use the command 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 commit