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

Re: [PATCH 4/5] git-merge: add support for --commit

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 23, 2007, 00:51 UTC
Message-ID
<7vir62dx0u.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1190421186-21784-5-git-send-email-hjemli@gmail.com>
Lars Hjemli <hjemli@gmail.com> writes:
> This option can be used to override --no-commit and --squash. The change
> also introduces slightly different behavior for --no-commit: when specified,
> it explicitly overrides --squash.

Makes me wonder if --no-squash also make sense to override a --squash. Is this really needed? IOW, does it ever make sense to have --no-commit in the configuration?

Previous: Lars HjemliNext: Lars Hjemli
Message 7 of 14 in “per branch options for git-merge incl. --no-ff”
  1. 0/5 per branch options for git-merge incl. --no-ffLars Hjemli, Sep 22, 2007
  2. 1/5 Add test-script for git-merge porcelainLars Hjemli, Sep 22, 2007
  3. 2/5 git-merge: refactor option parsingLars Hjemli, Sep 22, 2007
  4. 3/5 git-merge: add support for branch.<name>.mergeoptionsLars Hjemli, Sep 22, 2007
  5. 4/5 git-merge: add support for --commitLars Hjemli, Sep 22, 2007
  6. 5/5 git-merge: add --ff and --no-ff optionsLars Hjemli, Sep 22, 2007
  7. Junio C HamanoSep 23, 2007
  8. Lars HjemliSep 23, 2007
  9. Junio C HamanoSep 23, 2007
  10. Lars HjemliSep 23, 2007
  11. Junio C HamanoSep 23, 2007
  12. Lars HjemliSep 23, 2007
  13. Junio C HamanoSep 23, 2007
  14. Lars HjemliSep 23, 2007

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.