From: Stephen Boyd <bebarino@gmail.com>
To: Pat Notz <patnotz@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCHv7 5/6] commit: --squash option for use with rebase --autosquash
Date: Wed, 03 Nov 2010 02:20:16 -0700 [thread overview]
Message-ID: <4CD12950.2080901@gmail.com> (raw)
In-Reply-To: <1288727952-57498-6-git-send-email-patnotz@gmail.com>
Sorry if I've missed earlier versions and this has already been
answered. You can carry forward Cc's if you like and thus earlier
commentators will be more likely to re-review your code.
On 11/02/10 12:59, Pat Notz wrote:
> +--squash=<commit>::
> + Construct a commit message for use with `rebase --autosquash`.
> + The commit message subject line is taken from the specified
> + commit with a prefix of "squash! ". Can be used with additional
> + commit message options (`-m`/`-c`/`-C`/`-F`). See
> + linkgit:git-rebase[1] for details.
This doesn't mention the editor being invoked. The editor is invoked
only with certain option combinations right? I'm expecting this:
uses editor
------------
--squash
--squash -c
--squash -t
--squash -eF
--squash -eC
--squash -em
--squash --amend
doesn't use editor
------------------
--squash -C = no editor
--squash -m = no editor
--squash -F = no editor
I haven't thoroughly checked the code to make sure that's happening.
> @@ -619,6 +639,16 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
> else if (in_merge)
> hook_arg1 = "merge";
>
> + if (squash_message) {
> + /*
> + * If squash_commit was used for the commit subject,
squash_commit or squash_message?
next prev parent reply other threads:[~2010-11-03 9:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-02 19:59 [PATCHv7 0/6] Add commit message options for rebase --autosquash Pat Notz
2010-11-02 19:59 ` [PATCHv7 1/6] commit: helper methods to reduce redundant blocks of code Pat Notz
2010-11-02 20:42 ` Thiago Farina
2010-11-02 19:59 ` [PATCHv7 2/6] pretty.c: teach format_commit_message() to reencode the output Pat Notz
2010-11-02 19:59 ` [PATCHv7 3/6] commit: --fixup option for use with rebase --autosquash Pat Notz
2010-11-02 19:59 ` [PATCHv7 4/6] add tests of commit --fixup Pat Notz
2010-11-02 19:59 ` [PATCHv7 5/6] commit: --squash option for use with rebase --autosquash Pat Notz
2010-11-03 9:20 ` Stephen Boyd [this message]
2010-11-02 19:59 ` [PATCHv7 6/6] add tests of commit --squash Pat Notz
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CD12950.2080901@gmail.com \
--to=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=patnotz@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.