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

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

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

2014-05-23 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: The usage string for this option is: git replace [-f] --graft commit [parent...] First we create a new commit that is the same as commit except that its parents are [parents...] Then we create a replace ref that replace commit with the

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 commit [parent...] First we create a new commit that is the same as commit except that its parents are [parents...] Then we create a replace ref that replace

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

2014-05-23 Thread Junio C Hamano
Jeff King p...@peff.net 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 commit [parent...] First we create a new commit that is the same as commit except that its parents are [parents...] Then we

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 trimming. I

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

2014-05-23 Thread Junio C Hamano
Jeff King p...@peff.net 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.

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 gits...@pobox.com wrote: Jeff King p...@peff.net 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

[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 commit [parent...] First we create a new commit that is the same as commit except that its parents are [parents...] Then we create a replace ref that replace commit with the commit we just created. With this new option, it should be