git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Abhijeet Sonar <abhijeet.nkt@gmail.com>
Date
Oct 24, 2024, 07:59 UTC
Message-ID
<7038bb3a-2aad-4bde-bd46-f2bd2ef659d1@gmail.com>

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
Next: Taylor Blau
Message 1 of 2 in “[QUESTION] Can I merge --continue with --no-verify”
  1. Abhijeet SonarOct 24, 2024
  2. Taylor BlauOct 24, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.