Re: [PATCH] Add --ff-only flag to git-merge
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 28, 2009, 13:26 UTC
- Message-ID
- <alpine.DEB.1.00.0901281425180.3586@pacific.mpi-cbg.de>
- In-Reply-To
- <1233147238-30082-1-git-send-email-nothingmuch@woobling.org>
Hi,
On Wed, 28 Jan 2009, Yuval Kogman wrote:
Show 8 quoted lines
> @@ -1012,6 +1015,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
> finish(o->sha1, msg.buf);
> drop_save();
> return 0;
> + } else if ( only_fast_forward ) {
> + printf("Merge is non fast forward, aborting.\n");
> + return 1;
> } else if (!remoteheads->next && common->next)If you compare the two if() lines, you will see that you mixed style.
Ciao, Dscho