threads / rfc / 22624

[RFC] git rebase --edit

Subject: [RFC] git rebase --edit

## tl;dr

2 messages between Feb 12, 2010 and Feb 12, 2010.

replies: 1people: 2as markdown or json

Tay Ray Chuan· Feb 12, 2010, 08:44 UTC · lore
Hi,

sometimes, I need to edit a commit, and I find myself doing some rather "mechanical" steps.

  $ git log #find the commit
  $ git rebase -i <commit>^
  $ #mark <commit> with 'e', save, exit editor
  Stopped at <commit>... <commit message>
  You can amend the commit now, with
  ...

Perhaps git-rebase --interactive could learn an option, say, --edit <commit>, that

  1. determines where to start the rebase (instead of saying <commit>^ above),
  2. marks <commit> as 'e' in git-rebase-todo,
  3. start the edit process ("You can amend the commit now...").
The user would then proceed with the usual git-rebase --continue.
Is this a workable suggestion?
-- 
Cheers,
Ray Chuan
Johannes Schindelin· Feb 12, 2010, 09:29 UTC · re: Tay Ray Chuan · lore

Re: [RFC] git rebase --edit

Hi,
On Fri, 12 Feb 2010, Tay Ray Chuan wrote:
Show 12 quoted lines
> [description how to amend a single commit that is not HEAD]
>
> Perhaps git-rebase --interactive could learn an option, say, --edit
> <commit>, that
> 
>   1. determines where to start the rebase (instead of saying <commit>^ above),
>   2. marks <commit> as 'e' in git-rebase-todo,
>   3. start the edit process ("You can amend the commit now...").
> 
> The user would then proceed with the usual git-rebase --continue.
> 
> Is this a workable suggestion?
Sure!

Note that the current workflow for such things is to make a temporary commit which is then handled by the new "fixup" command. But of course, this only works if your history is not messy, i.e. has too many changes in the same place (because then the fixup commit does not apply cleanly to the commit in question).

Ciao, Dscho

← back to recent threads