All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: Anders Melchiorsen <mail@cup.kalibalik.dk>,
	git@vger.kernel.org, Johannes.Schindelin@gmx.de
Subject: Re: [RFC PATCH] Make the rebase edit mode really end up in an edit state
Date: Thu, 15 Jan 2009 14:09:08 -0800	[thread overview]
Message-ID: <7vvdsgql17.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20090115153529.GA13961@neumann> (SZEDER Gábor's message of "Thu, 15 Jan 2009 16:35:29 +0100")

SZEDER Gábor <szeder@ira.uka.de> writes:

> I think we might want do differentiate editing a commit (modifying
> either the commit message or the patch or both) or splitting a commit.
>
> The first is served well with the current 'edit' rebase command IMHO.
> I don't really see the point of the additional 'git reset --soft
> HEAD^'.
>
>  * If you want to edit the commit message only, then you are
>    better off with 'git commit --amend', because it preserves the
>    previous commit message.  But with 'git reset --soft HEAD^' and
>    'git commit' the commit message is "lost"; you have to use 'git
>    commit -c ORIG_HEAD' instead, which is not that straightforward
>    (and we don't have completion support for it).

I agree that is a true disadvantage that shows "reset --soft HEAD^" is a
bad idea (you could still say commit -c @{1}, though).

> For the second we could introduce a new rebase command like 'split',
> which would do the same as 'edit' but would also perform that 'git
> reset HEAD^' mentioned in the documentation automatically.

Perhaps.  

  reply	other threads:[~2009-01-15 22:10 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-15  0:27 [RFC PATCH] Make the rebase edit mode really end up in an edit state Anders Melchiorsen
2009-01-15  0:43 ` Junio C Hamano
2009-01-15  2:49   ` Boyd Stephen Smith Jr.
2009-01-15  4:10     ` Miles Bader
2009-01-15  5:00       ` Boyd Stephen Smith Jr.
2009-01-15  6:13       ` Junio C Hamano
2009-01-15 12:24       ` Johannes Schindelin
2009-01-15 15:35   ` SZEDER Gábor
2009-01-15 22:09     ` Junio C Hamano [this message]
2009-01-15 22:20       ` Sverre Rabbelier
2009-01-15 22:59         ` SZEDER Gábor
2009-01-16  0:11           ` Björn Steinbrink
2009-01-16  1:34             ` Johannes Schindelin
2009-01-18  1:24             ` Anders Melchiorsen
2009-01-16  1:09           ` Junio C Hamano
2009-01-16 12:10             ` Johannes Schindelin
2009-01-15  0:49 ` Stephan Beyer
2009-01-15  0:53 ` Johannes Schindelin
2009-01-15  7:35   ` Johannes Sixt
2009-01-15 10:01     ` Johan Herland
2009-01-15 11:52       ` Sverre Rabbelier
2009-01-15 12:36         ` Johannes Schindelin
2009-01-15 12:44           ` Adeodato Simó
2009-01-15 13:41             ` Johannes Schindelin
2009-01-15 13:41               ` Sverre Rabbelier
2009-01-15 13:57                 ` Stephan Beyer
2009-01-15 14:02                   ` Johannes Schindelin
2009-01-15 13:43               ` Adeodato Simó
2009-01-15 12:45           ` Sverre Rabbelier
2009-01-15 13:42             ` Johannes Schindelin
2009-01-15 13:56               ` Sverre Rabbelier
2009-01-15 16:59             ` Junio C Hamano
2009-01-15 17:16               ` Sverre Rabbelier
2009-01-15 18:21               ` Johannes Schindelin
2009-01-15 18:46                 ` Johan Herland
2009-01-15 18:53                   ` Anders Melchiorsen
2009-01-15 19:28                     ` Johannes Schindelin
2009-01-15 19:27                   ` Wincent Colaiuta
2009-01-15 20:26                     ` Jay Soffian
2009-01-15 21:58                       ` Wincent Colaiuta
2009-01-16  9:50                       ` Johan Herland
2009-01-16 10:27                         ` Anders Melchiorsen
2009-01-16 10:58                           ` Johan Herland
2009-01-16 12:42                             ` SZEDER Gábor
2009-01-16 12:57                               ` Johannes Schindelin
2009-01-16 13:27                                 ` SZEDER Gábor
2009-01-16 14:28                                   ` Wincent Colaiuta
2009-01-16 13:12                         ` Sverre Rabbelier
2009-01-16 17:26                           ` Stephan Beyer
2009-01-16 21:06                             ` Johannes Schindelin
2009-01-15 12:52           ` Pieter de Bie
2009-01-15 12:55             ` Sverre Rabbelier
2009-01-15 12:57           ` Pieter de Bie
2009-01-15 13:46             ` Björn Steinbrink
2009-01-15 13:54         ` Johan Herland

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=7vvdsgql17.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=mail@cup.kalibalik.dk \
    --cc=szeder@ira.uka.de \
    /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.