Re: [PATCH v2 3/3] commit: add --cleanup=scissors

2014-02-24 Thread Junio C Hamano
Duy Nguyen writes: > I think I described it incorrectly as "conflict message" while it's > not. This is the part to be cut out by the patch > > # It looks like you may be committing a merge. > # If this is not correct, please remove the file. > # MERGE_HEAD > # and try again. > > (similar mes

Re: [PATCH v2 3/3] commit: add --cleanup=scissors

2014-02-24 Thread Duy Nguyen
On Tue, Feb 25, 2014 at 12:20 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Mon, Feb 17, 2014 at 07:15:32PM +0700, Nguyễn Thái Ngọc Duy wrote: >>> @@ -777,6 +778,8 @@ static int prepare_to_commit(const char *index_file, >>> const char *prefix, >>> _("Please

Re: [PATCH v2 3/3] commit: add --cleanup=scissors

2014-02-24 Thread Junio C Hamano
Duy Nguyen writes: > On Mon, Feb 17, 2014 at 07:15:32PM +0700, Nguyễn Thái Ngọc Duy wrote: >> @@ -777,6 +778,8 @@ static int prepare_to_commit(const char *index_file, >> const char *prefix, >> _("Please enter the commit message for your >> changes." >>

Re: [PATCH v2 3/3] commit: add --cleanup=scissors

2014-02-21 Thread Duy Nguyen
On Mon, Feb 17, 2014 at 07:15:32PM +0700, Nguyễn Thái Ngọc Duy wrote: > @@ -777,6 +778,8 @@ static int prepare_to_commit(const char *index_file, > const char *prefix, > _("Please enter the commit message for your > changes." > " Lines