From: Martin Waitz <tali@admingilde.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [RFC] git commit --branch
Date: Mon, 29 May 2006 23:37:04 +0200 [thread overview]
Message-ID: <20060529213704.GG14325@admingilde.org> (raw)
In-Reply-To: <Pine.LNX.4.63.0605292310280.17412@wbgn013.biozentrum.uni-wuerzburg.de>
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
hoi :)
On Mon, May 29, 2006 at 11:14:32PM +0200, Johannes Schindelin wrote:
> Doesn't
>
> $ git-update-index $(git-ls-files --modified)
> $ git-checkout -b tempBranch
> $ git-commit -m "to test"
>
> work? It also avoids totally bogus parents (if I read your patch
> correctly, you take the current HEAD as the true parent, but record the
> current HEAD of the other branch as parent nevertheless).
I'm doing two commits, one to HEAD and one to the other branch.
It is more like:
git commit
git checkout otherbranch
git rebase --onto otherbranch master^ master <-- first
git checkout master
git merge msg master otherbranch <-- second
Now your current HEAD is still a merge of your topic branches,
and you commited your changes to one clean topic branch.
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2006-05-29 21:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-29 20:28 [RFC] git commit --branch Martin Waitz
2006-05-29 20:41 ` Shawn Pearce
2006-05-29 21:22 ` Martin Waitz
2006-05-29 21:35 ` Shawn Pearce
2006-05-29 21:55 ` Martin Waitz
2006-05-29 22:16 ` Shawn Pearce
2006-05-29 21:14 ` Johannes Schindelin
2006-05-29 21:27 ` Jakub Narebski
2006-05-29 21:37 ` Martin Waitz [this message]
2006-05-29 21:58 ` Johannes Schindelin
2006-05-30 9:12 ` Junio C Hamano
2006-05-30 21:05 ` Martin Waitz
2006-05-30 22:52 ` Junio C Hamano
2006-05-31 15:21 ` Martin Waitz
2006-06-05 18:22 ` Jon Loeliger
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=20060529213704.GG14325@admingilde.org \
--to=tali@admingilde.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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).