Re: [PATCH v1 1/3] replace: add --graft option

2014-06-01 Thread Christian Couder
From: Jeff King > On Thu, May 22, 2014 at 11:33:04PM +0200, Christian Couder wrote: > >> The usage string for this option is: >> >> git replace [-f] --graft [...] >> >> First we create a new commit that is the same as >> except that its parents are [...] >> >> Then we create a replace ref t

Re: [PATCH v1 1/3] replace: add --graft option

2014-05-23 Thread Eric Sunshine
On Fri, May 23, 2014 at 5:22 PM, Junio C Hamano wrote: > Jeff King writes: > >> On Fri, May 23, 2014 at 01:05:40PM -0700, Junio C Hamano wrote: >> >>> I just read read_graft_line(); it allows an empty line (both >>> length-0 before the terminating LF or CRLF, and a line with >>> isspace() only) a

Re: [PATCH v1 1/3] replace: add --graft option

2014-05-23 Thread Junio C Hamano
Jeff King writes: > On Fri, May 23, 2014 at 01:05:40PM -0700, Junio C Hamano wrote: > >> I just read read_graft_line(); it allows an empty line (both >> length-0 before the terminating LF or CRLF, and a line with >> isspace() only) and ignore them, so "grep '^[^#]'" is not >> sufficient. > > Than

Re: [PATCH v1 1/3] replace: add --graft option

2014-05-23 Thread Jeff King
On Fri, May 23, 2014 at 01:05:40PM -0700, Junio C Hamano wrote: > I just read read_graft_line(); it allows an empty line (both > length-0 before the terminating LF or CRLF, and a line with > isspace() only) and ignore them, so "grep '^[^#]'" is not > sufficient. Thanks, I missed the space trimmin

Re: [PATCH v1 1/3] replace: add --graft option

2014-05-23 Thread Junio C Hamano
Jeff King writes: > On Thu, May 22, 2014 at 11:33:04PM +0200, Christian Couder wrote: > >> The usage string for this option is: >> >> git replace [-f] --graft [...] >> >> First we create a new commit that is the same as >> except that its parents are [...] >> >> Then we create a replace ref

Re: [PATCH v1 1/3] replace: add --graft option

2014-05-23 Thread Jeff King
On Thu, May 22, 2014 at 11:33:04PM +0200, Christian Couder wrote: > The usage string for this option is: > > git replace [-f] --graft [...] > > First we create a new commit that is the same as > except that its parents are [...] > > Then we create a replace ref that replace with > the commit

Re: [PATCH v1 1/3] replace: add --graft option

2014-05-23 Thread Junio C Hamano
Christian Couder writes: > The usage string for this option is: > > git replace [-f] --graft [...] > > First we create a new commit that is the same as > except that its parents are [...] > > Then we create a replace ref that replace with > the commit we just created. Shucks. An older versio

[PATCH v1 1/3] replace: add --graft option

2014-05-22 Thread Christian Couder
The usage string for this option is: git replace [-f] --graft [...] First we create a new commit that is the same as except that its parents are [...] Then we create a replace ref that replace with the commit we just created. With this new option, it should be straightforward to convert graf