[QUESTION] Can I merge --continue with --no-verify

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

 



I recently found myself wanting to continue a merge after resolving
conflicts without having the pre-commit hook run:

git merge --continue --no-verify

this fails and prints usage.

Digging the source, I can see that in builtin/merge.c:1378 we do:

    if (continue_current_merge) {
        [...]

        if (orig_argc != 2)
            usage_msg_opt(_("--continue expects no arguments"),   
                  builtin_merge_usage, builtin_merge_options);

I see why we would want this - the --continue flag makes the merge command
perform an operation that is very different than what merge normally does
without this option and therefore the usual options do not apply.
However, I think
it does make sense to allow --no-verify - it feels very intuitive to use
it when
bypassing the pre-commit hook is desired while continuing a merge.

Thanks






[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