git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Charvi Mendiratta <charvi077@gmail.com>
To: Mike McLean <stixmclean@googlemail.com>
Cc: git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
	sandals@crustytoothpaste.net,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	j6t@kdbg.org, Christian Couder <christian.couder@gmail.com>,
	Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: Git Feature Request (Fixdown in interactive rebase)
Date: Wed, 27 Jan 2021 13:25:14 +0530	[thread overview]
Message-ID: <CAPSFM5d79AEx478twqrLpUuhq1+mF_bvOsfyvRuQVgQO167DrA@mail.gmail.com> (raw)
In-Reply-To: <CAM0jFOdCD1uEcHaPB_go7aarapEBKx6M4d35zVOP8h9=MuZEmA@mail.gmail.com>

Hi,

On Thu, 24 Dec 2020 at 04:42, Mike McLean <stixmclean@googlemail.com> wrote:
[...]
> =-=-=-=-=-=-=-=
>
> During an interactive rebase, the text file defining the operations
> has a command option for "fixup".
> This will squash the target commit into the previous commit (listed
> above it in the file), and automatically use the commit message of the
> previous commit (thus bypassing the "choose the commit message"
> dialog/file).
>
> Can we have a similar convenience-command that squashes, and retains
> the second commit's message? Purpose is the same as the fixup command
> - saving a bit of time and unnecessary typing during a common
> operation.
>

It seems that this FR is addressed by the patches as here[1], which are
under review. It adds the options to fixup command i.e fixup [-C|-c] in the
interactive rebase that gives the flexibility to select or edit the
commit message
while fixing up the commit using fixup command. So, changing `pick` command
to `fixup -C` will fixup the content and replace the previous commit
message with
the second commit message(ie. the fixup commit message).

Thanks and Regards,
Charvi

[1] https://lore.kernel.org/git/20210124170405.30583-1-charvi077@gmail.com/

      parent reply	other threads:[~2021-01-27  8:09 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CAM0jFOeCE-iTAMkiGE6m8bVNjJRn-BUmbUAP2ANrj4FbhuQG=g@mail.gmail.com>
2020-12-23 23:08 ` Git Feature Request (Fixdown in interactive rebase) Mike McLean
2020-12-23 23:25   ` brian m. carlson
2020-12-23 23:28     ` Mike McLean
2020-12-23 23:57   ` Junio C Hamano
2020-12-24  0:13     ` Mike McLean
2020-12-24  9:16       ` Johannes Sixt
2020-12-24 22:21         ` Junio C Hamano
2020-12-24 22:54           ` Johannes Sixt
2021-01-06 22:40             ` Johannes Schindelin
2021-01-27  7:55   ` Charvi Mendiratta [this message]

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=CAPSFM5d79AEx478twqrLpUuhq1+mF_bvOsfyvRuQVgQO167DrA@mail.gmail.com \
    --to=charvi077@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=sandals@crustytoothpaste.net \
    --cc=stixmclean@googlemail.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 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 NNTP newsgroup(s).