From: Jan Hudec <bulb@ucw.cz>
To: Johannes Schneider <mailings@cedarsoft.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Commit to other branch
Date: Sun, 6 Jun 2010 20:43:34 +0200 [thread overview]
Message-ID: <20100606184334.GB30035@efreet.light.src> (raw)
In-Reply-To: <4C03D9C1.1060404@cedarsoft.com>
On Mon, May 31, 2010 at 17:46:09 +0200, Johannes Schneider wrote:
> I often run in that scenario:
> I see a small bugfix/typo/missing documentation. Of course I just add a
> bit of code to fix that issue...
> Then I'd like to commit that change as own commit. And most of the time
> this is possible without any problems (git commit <file>).
> But as I am *always* working on a topic branch, it takes some work to
> commit that change to another branch.
What I'd probably do is just commit the quick fix, as separate commit, where
I am. Than when I'd have a bit of time (probably when I'd otherwise think of
rebasing on master anyway) I'd rebase -i all such fixes to the bottom of the
topic branch, go to master and merge just those fixes. The rebase -i can be
against current master, so the merge back would be fast-forward, of course.
--
Jan 'Bulb' Hudec <bulb@ucw.cz>
prev parent reply other threads:[~2010-06-06 18:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-31 15:46 Commit to other branch Johannes Schneider
2010-05-31 16:28 ` Matthieu Moy
2010-05-31 23:50 ` Jeff King
2010-06-06 18:43 ` Jan Hudec [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=20100606184334.GB30035@efreet.light.src \
--to=bulb@ucw.cz \
--cc=git@vger.kernel.org \
--cc=mailings@cedarsoft.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).