Re: [PATCH/RFCv4 1/2] git-rebase -i: add command "drop" to remove a commit

2015-06-03 Thread Remi Galan Alfonso
Junio C Hamano writes: > But what if you got this back after the user edits? > > drop > pick 2c9c1c5 gostak: distim doshes > drop e3b601d pull: use git-rev-parse... > edit eb2a8d9 pull: handle git-fetch'... > > [...] > Did the user tried to drop something else but the > object na

Re: [PATCH/RFCv4 1/2] git-rebase -i: add command "drop" to remove a commit

2015-06-03 Thread Junio C Hamano
Galan Rémi writes: > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index dc3133f..869cc60 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -152,6 +152,7 @@ Commands: > s, squash = use commit, but meld into previous commit > f, fixup =

[PATCH/RFCv4 1/2] git-rebase -i: add command "drop" to remove a commit

2015-06-03 Thread Galan Rémi
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 c