Re: [PATCH v3] pull: warn if the user didn't say whether to rebase or to merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Alex Henrie <alexhenrie24@xxxxxxxxx> writes:

> v3:
> - Fix segfault if opt_ff is NULL
> - Don't say that the behavior will change in a future version of Git
> (that hasn't been decided yet)
> - Mention that pull.ff=only is also an option
> - Mention git config's --global option
> - Make the warning message longer and more clear in general
> ---
>  builtin/pull.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)

Another thing tests noticed was that this broke #5521.2.



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux