Re: [RFC/PATCH] git-merge: implement --ff-only-merge option.

2014-10-08 Thread Sergey Organov
Junio C Hamano writes: > Sergey Organov writes: > >>> Because rebasing immediately before is considered a bad manner, >>> i.e. encouraging a wrong workflow? >> >> Why? What is wrong about it? > > Searching the kernel archive for messages that talks about "rebase" > and "pull-request" from Linus

Re: [RFC/PATCH] git-merge: implement --ff-only-merge option.

2014-10-07 Thread Junio C Hamano
Sergey Organov writes: >> Because rebasing immediately before is considered a bad manner, >> i.e. encouraging a wrong workflow? > > Why? What is wrong about it? Searching the kernel archive for messages that talks about "rebase" and "pull-request" from Linus would tell us why it is frowned upon

Re: [RFC/PATCH] git-merge: implement --ff-only-merge option.

2014-10-07 Thread Sergey Organov
Junio C Hamano writes: > Sergey Organov writes: > >>> Why would it be useful to limit the history to a shape where all >>> merges are the ones that could have been fast-forwarded? >> >> Except by true merge, how else can I express with git that 'n' >> consequitive commits constitute single logic

Re: [RFC/PATCH] git-merge: implement --ff-only-merge option.

2014-10-07 Thread Junio C Hamano
Sergey Organov writes: >> Why would it be useful to limit the history to a shape where all >> merges are the ones that could have been fast-forwarded? > > Except by true merge, how else can I express with git that 'n' > consequitive commits constitute single logical change (being originally > som

Re: [RFC/PATCH] git-merge: implement --ff-only-merge option.

2014-10-07 Thread Sergey Organov
Junio C Hamano writes: > Sergey Organov writes: > >> This option allows to create merge commit when fast-forward is >> possible, and abort otherwise. I.e. it's equivalent to --ff-only, >> except that it finally creates merge commit instead of >> fast-forwarding. >> >> One may also consider this

Re: [RFC/PATCH] git-merge: implement --ff-only-merge option.

2014-10-07 Thread Junio C Hamano
Sergey Organov writes: > This option allows to create merge commit when fast-forward is > possible, and abort otherwise. I.e. it's equivalent to --ff-only, > except that it finally creates merge commit instead of > fast-forwarding. > > One may also consider this option to be equivalent to --no-ff

[RFC/PATCH] git-merge: implement --ff-only-merge option.

2014-10-07 Thread Sergey Organov
This option allows to create merge commit when fast-forward is possible, and abort otherwise. I.e. it's equivalent to --ff-only, except that it finally creates merge commit instead of fast-forwarding. One may also consider this option to be equivalent to --no-ff with additional check that the comm