Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-03 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Michael Haggerty writes: >> >>> Or perhaps "-NUM" should fail with an error message if any of the last >>> NUM commits are merges. In that restricted scenario (which probably >>> accounts for 99% of rebases), "-NUM" is equivalent to "HEAD~NUM"

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-03 Thread Junio C Hamano
Matthieu Moy writes: > Michael Haggerty writes: > >> Or perhaps "-NUM" should fail with an error message if any of the last >> NUM commits are merges. In that restricted scenario (which probably >> accounts for 99% of rebases), "-NUM" is equivalent to "HEAD~NUM". > > Makes sense to me. So, -NUM

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-03 Thread Junio C Hamano
Michael Haggerty writes: > This might be a reason that "-NUM" is a bad idea. > > Or perhaps "-NUM" should fail with an error message if any of the last > NUM commits are merges. In that restricted scenario (which probably > accounts for 99% of rebases), "-NUM" is equivalent to "HEAD~NUM". That

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-03 Thread David Kastrup
Duy Nguyen writes: > On Mon, Mar 3, 2014 at 4:37 PM, Matthieu Moy > wrote: >> Michael Haggerty writes: >> >>> Or perhaps "-NUM" should fail with an error message if any of the last >>> NUM commits are merges. In that restricted scenario (which probably >>> accounts for 99% of rebases), "-NUM"

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-03 Thread Jeff King
On Mon, Mar 03, 2014 at 10:37:11AM +0100, Matthieu Moy wrote: > Michael Haggerty writes: > > > Or perhaps "-NUM" should fail with an error message if any of the last > > NUM commits are merges. In that restricted scenario (which probably > > accounts for 99% of rebases), "-NUM" is equivalent to

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-03 Thread Matthieu Moy
Duy Nguyen writes: > On Mon, Mar 3, 2014 at 4:37 PM, Matthieu Moy > >> This would actually be a feature for me: I often want to rebase "recent >> enough" history, and when my @{upstream} isn't well positionned, I >> randomly type HEAD~N without remembering what N should be. When N is too >> small

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-03 Thread Duy Nguyen
On Mon, Mar 3, 2014 at 4:37 PM, Matthieu Moy wrote: > Michael Haggerty writes: > >> Or perhaps "-NUM" should fail with an error message if any of the last >> NUM commits are merges. In that restricted scenario (which probably >> accounts for 99% of rebases), "-NUM" is equivalent to "HEAD~NUM". >

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-03 Thread Matthieu Moy
Michael Haggerty writes: > Or perhaps "-NUM" should fail with an error message if any of the last > NUM commits are merges. In that restricted scenario (which probably > accounts for 99% of rebases), "-NUM" is equivalent to "HEAD~NUM". Makes sense to me. So, -NUM would actually mean "rebase the

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-03 Thread Michael Haggerty
On 03/02/2014 04:55 PM, Matthieu Moy wrote: > Eric Sunshine writes: > >> On Sun, Mar 2, 2014 at 3:53 AM, Eric Sunshine >> wrote: >>> On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy >>> wrote: This is "rev-list style", where people can do "git rev-list -3" in addition to "git re

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-02 Thread Matthieu Moy
Eric Sunshine writes: > On Sun, Mar 2, 2014 at 3:53 AM, Eric Sunshine wrote: >> On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy >> wrote: >>> This is "rev-list style", where people can do "git rev-list -3" in >>> addition to "git rev-list HEAD~3". A lot of commands are driven by the >>> r

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-02 Thread Eric Sunshine
On Sun, Mar 2, 2014 at 3:53 AM, Eric Sunshine wrote: > On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy > wrote: >> This is "rev-list style", where people can do "git rev-list -3" in >> addition to "git rev-list HEAD~3". A lot of commands are driven by the >> revision machinery and also acce

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy wrote: > This is "rev-list style", where people can do "git rev-list -3" in > addition to "git rev-list HEAD~3". A lot of commands are driven by the > revision machinery and also accept this form. This addition to rebase > is just for convenienc

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-02 Thread Duy Nguyen
On Sun, Mar 2, 2014 at 3:37 PM, Eric Sunshine wrote: > On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy > wrote: >> This is "rev-list style", where people can do "git rev-list -3" in >> addition to "git rev-list HEAD~3". A lot of commands are driven by the >> revision machinery and also acce

Re: [PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy wrote: > This is "rev-list style", where people can do "git rev-list -3" in > addition to "git rev-list HEAD~3". A lot of commands are driven by the > revision machinery and also accept this form. This addition to rebase > is just for convenienc

[PATCH 2/3] rebase: accept - as another way of saying HEAD~

2014-03-01 Thread Nguyễn Thái Ngọc Duy
This is "rev-list style", where people can do "git rev-list -3" in addition to "git rev-list HEAD~3". A lot of commands are driven by the revision machinery and also accept this form. This addition to rebase is just for convenience. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-rebas