Re: [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT

2018-02-02 Thread Junio C Hamano
Duy Nguyen writes: > On Thu, Feb 1, 2018 at 6:18 AM, Junio C Hamano wrote: > ... >> Hmph, how is this new file conceptually different from existing ones >> like CHERRY_PICK_HEAD? > > Conceptually the same, except that CHERRY_PICK_HEAD can't be reused >

Re: [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT

2018-02-01 Thread Phillip Wood
On 31/01/18 09:30, Nguyễn Thái Ngọc Duy wrote: > > The new command `git rebase --show-current-patch` is useful for seeing > the commit related to the current rebase state. Some however may find > the "git show" command behind it too limiting. You may want to > increase context lines, do a diff

Re: [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT

2018-02-01 Thread Duy Nguyen
On Thu, Feb 1, 2018 at 6:18 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> The new command `git rebase --show-current-patch` is useful for seeing >> the commit related to the current rebase state. Some however may find >> the "git show"

Re: [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT

2018-01-31 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The new command `git rebase --show-current-patch` is useful for seeing > the commit related to the current rebase state. Some however may find > the "git show" command behind it too limiting. You may want to > increase context lines, do a diff

[PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new command `git rebase --show-current-patch` is useful for seeing the commit related to the current rebase state. Some however may find the "git show" command behind it too limiting. You may want to increase context lines, do a diff that ignores whitespaces... For these advanced use cases,