Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-04 Thread Michael Haggerty
On 03/04/2014 03:08 AM, Duy Nguyen wrote: On Tue, Mar 4, 2014 at 3:28 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-04 Thread Duy Nguyen
On Tue, Mar 4, 2014 at 3:59 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On Tue, Mar 4, 2014 at 3:28 AM, Eric Sunshine sunsh...@sunshineco.com wrote: Is it correct to single out only edit for special treatment? If allowing edit on the command-line, then shouldn't command-line reword also

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-04 Thread Michael Haggerty
On 03/04/2014 11:24 AM, Duy Nguyen wrote: On Tue, Mar 4, 2014 at 3:59 PM, Michael Haggerty mhag...@alum.mit.edu wrote: git rebase --fixup COMMIT git rebase --squash COMMIT This is not interactive (except when merge conflicts occur), is it? --fixup would not be interactive (is that a

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-04 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: ... All of the following seem to make sense: git rebase --edit COMMIT A long-form for the -e option we have been talking about. It is unfortunately that this spelling sounds like the --edit option on git commit

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-03 Thread Michael Haggerty
On 03/02/2014 10:09 AM, Eric Sunshine wrote: On Sun, Mar 2, 2014 at 4:04 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-03 Thread Duy Nguyen
On Mon, Mar 3, 2014 at 5:10 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 03/02/2014 10:09 AM, Eric Sunshine wrote: On Sun, Mar 2, 2014 at 4:04 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-03 Thread David Kastrup
Duy Nguyen pclo...@gmail.com writes: Logically, yes. Practically, no. If you have to put multiple -e and some hashes in one line, wouldn't editing to-do list in your favorite editor be faster? An editor is the last resort when the card puncher is broken. -- David Kastrup -- To unsubscribe

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-03 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git rebase -i XYZ^ In English, it prepares the todo list for you to edit only commit XYZ to save your time. The time saving is

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-03 Thread Duy Nguyen
On Tue, Mar 4, 2014 at 3:28 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git rebase -i XYZ^ In English, it prepares the

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git rebase -i XYZ^ In English, it prepares the todo list for you to edit only commit XYZ to save your time. The time saving is

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-02 Thread Eric Sunshine
On Sun, Mar 2, 2014 at 4:04 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git rebase -i XYZ^ In English, it prepares the

[PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-01 Thread Nguyễn Thái Ngọc Duy
git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git rebase -i XYZ^ In English, it prepares the todo list for you to edit only commit XYZ to save your time. The time saving is only significant when you edit a lot of commits separately. Signed-off-by: Nguyễn