Re: [PATCH v2 2/3] Allow for MERGE_MODE to specify more then one mode

2012-11-27 Thread Junio C Hamano
Kacper Kornet writes: > This way when only no-ff is specified all parsers should be happy. If > reversed-order is specified together no-ff the "external" parser > probably would fail. Which in my opinion is a good think at this point, > as it can't correctly interpret MERGE_MODE anyway. Amen to

Re: [PATCH v2 2/3] Allow for MERGE_MODE to specify more then one mode

2012-11-27 Thread Kacper Kornet
On Tue, Nov 27, 2012 at 06:17:28PM -0800, Junio C Hamano wrote: > Kacper Kornet writes: > > Presently only one merge mode exists: non-fast-forward. But in future > > the second one (transpose-parents) will be added, so the need to read > > all lines of MERGE_MODE. > > Signed-off-by: Kacper Korne

Re: [PATCH v2 2/3] Allow for MERGE_MODE to specify more then one mode

2012-11-27 Thread Junio C Hamano
Kacper Kornet writes: > Presently only one merge mode exists: non-fast-forward. But in future > the second one (transpose-parents) will be added, so the need to read > all lines of MERGE_MODE. > > Signed-off-by: Kacper Kornet > --- > builtin/commit.c | 12 ++-- > 1 file changed, 6 inser