All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anders Melchiorsen <mail@cup.kalibalik.dk>
To: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: rebase edit handling
Date: Wed, 13 May 2009 10:18:27 +0200	[thread overview]
Message-ID: <589ffd8942fd21b6f727163f78592381@mail.hotelhot.dk> (raw)
In-Reply-To: <fcaeb9bf0905122351y3a1235e8s5cc9b83c225ca9c6@mail.gmail.com>

On Wed, 13 May 2009 16:51:33 +1000, Nguyen Thai Ngoc Duy
<pclouds@gmail.com>
wrote:

> Could we unit the way to squash/edit commits in rebase? If I squash a
> commit it, I need to to update the index and continue rebase. If I
> edit a commit, I need to amend that commit. The problem is when I have
> a few edits/squashes in the same rebase, I easily get confused and do
> "commit --amend" on squash too.

A squash does not leave you at the prompt, unless you abort the editor
with the concatenated commit messages. So where does your confusion
come from?

Anyway, here is a (fruitless) thread on the confusing UI of interactive
rebase:

  http://thread.gmane.org/gmane.comp.version-control.git/105738

Maybe it answers your question in some way.


Anders.

  parent reply	other threads:[~2009-05-13  8:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-13  6:51 rebase edit handling Nguyen Thai Ngoc Duy
2009-05-13  6:59 ` Nguyen Thai Ngoc Duy
2009-05-13  8:18 ` Anders Melchiorsen [this message]
2009-05-13  9:52   ` Nguyen Thai Ngoc Duy

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=589ffd8942fd21b6f727163f78592381@mail.hotelhot.dk \
    --to=mail@cup.kalibalik.dk \
    --cc=git@vger.kernel.org \
    --cc=pclouds@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.