git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Lars Hjemli <hjemli@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 4/5] git-merge: add support for --commit
Date: Sat, 22 Sep 2007 17:51:29 -0700	[thread overview]
Message-ID: <7vir62dx0u.fsf@gitster.siamese.dyndns.org> (raw)
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?

  parent reply	other threads:[~2007-09-23  0:51 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-22  0:33 [PATCH 0/5] per branch options for git-merge incl. --no-ff Lars Hjemli
2007-09-22  0:33 ` [PATCH 1/5] Add test-script for git-merge porcelain Lars Hjemli
2007-09-22  0:33   ` [PATCH 2/5] git-merge: refactor option parsing Lars Hjemli
2007-09-22  0:33     ` [PATCH 3/5] git-merge: add support for branch.<name>.mergeoptions Lars Hjemli
2007-09-22  0:33       ` [PATCH 4/5] git-merge: add support for --commit Lars Hjemli
2007-09-22  0:33         ` [PATCH 5/5] git-merge: add --ff and --no-ff options Lars Hjemli
2007-09-23  0:51         ` Junio C Hamano [this message]
2007-09-23 10:35           ` [PATCH 4/5] git-merge: add support for --commit Lars Hjemli
2007-09-23  0:51       ` [PATCH 3/5] git-merge: add support for branch.<name>.mergeoptions Junio C Hamano
2007-09-23 10:31         ` Lars Hjemli
2007-09-23 19:20           ` Junio C Hamano
2007-09-23 19:33             ` Lars Hjemli
2007-09-23  0:51   ` [PATCH 1/5] Add test-script for git-merge porcelain Junio C Hamano
2007-09-23 10:24     ` Lars Hjemli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vir62dx0u.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=hjemli@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).