From: Johannes Sixt <j.sixt@viscovery.net>
To: Philipp Marek <philipp@marek.priv.at>
Cc: git@vger.kernel.org
Subject: Re: Feature request: show branches in interactive commit
Date: Thu, 28 Jun 2012 10:53:57 +0200 [thread overview]
Message-ID: <4FEC1BA5.8030307@viscovery.net> (raw)
In-Reply-To: <fd93774cb5ed6d4dee090eb2b0be952e.squirrel@webmail.hitco.org>
Am 6/28/2012 9:54, schrieb Philipp Marek:
> Say that "123458" is a commit with "branch1" associated; then I'd hope for output like
>
> pick 123456 ...
> pick 123457 ...
> pick 123458 ...
> #x git branch "branch1" --force # move the branch?
> pick 123459 ...
> pick 12345a ...
>
> I have a few feature branches that are stacked upon each other; when moving a commit
> "down" to the release-branch I'd like to have the other branches at the matching "new"
> commit.
>
> Of course I can simply fix up the "rebase" output in my editor - but I guess that might
> help a few people, that's why I'm proposing it here.
I happen to have one such topic branch stack myself that I carry around
since a while. But the implementation must be a bit smarter: What should
happen if you --abort after e.g. 123459 was picked?
I used this scheme sometimes:
pick 123456 ...
pick 123457 ...
pick 123458 ...
x git rev-parse HEAD >sha1
pick 123459 ...
pick 12345a ...
x git branch --force "branch1" $(cat sha1)
Granted, an indication where the topic branch heads would have to go in
the todo list, as you suggest, would be nice first step.
-- Hannes
prev parent reply other threads:[~2012-06-28 8:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-28 7:54 Feature request: show branches in interactive commit Philipp Marek
2012-06-28 8:53 ` Johannes Sixt [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=4FEC1BA5.8030307@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=philipp@marek.priv.at \
/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).