Re: [PATCH] sequencer: allow disabling conflict advice

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

 



We already have "advice.resolveConflict" to suppress conflict advice.

Oh looking more closely that is doing something slightly different - it suppresses advice about pre-existing conflicts in the index when starting a merge etc. So we probably do need a new config variable but I think it should have a generic name - not be sequencer specific so we can extend its scope in the future to "git merge", "git am -3", "git stash" etc.

Best Wishes

Phillip




[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