From: Johannes Sixt <j.sixt@viscovery.net>
To: John Dlugosz <JDlugosz@TradeStation.com>
Cc: Bryan Donlan <bdonlan@gmail.com>, git@vger.kernel.org
Subject: Re: proper way to merge?
Date: Tue, 03 Mar 2009 08:32:39 +0100 [thread overview]
Message-ID: <49ACDD17.2060601@viscovery.net> (raw)
In-Reply-To: <450196A1AAAE4B42A00A8B27A59278E709F07452@EXCHANGE.trad.tradestation.com>
John Dlugosz schrieb:
> I did not find 'grafts' in the documentation,
> but I looked for it now that I know about it. So you can add another
> parent to the graph just by adding a line to that file. BTW,
> filter-branch isn't available on msysgit.
Huh? filter-branch *is* in msysgit. Why do you think it is not?
> But leaving it in that grafts
> file should be OK -- is that pushed/pulled with everything else?
No.
You really want to use filter-branch if the new parent is to be permanent.
-- Hannes
next prev parent reply other threads:[~2009-03-03 7:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-27 22:11 proper way to merge? John Dlugosz
2009-02-28 7:58 ` John Tapsell
2009-03-02 22:19 ` John Dlugosz
2009-03-03 5:01 ` John Tapsell
2009-03-02 8:33 ` Bryan Donlan
2009-03-02 22:44 ` John Dlugosz
2009-03-03 7:32 ` Johannes Sixt [this message]
2009-03-03 16:04 ` John Dlugosz
2009-03-03 16:15 ` Johannes Sixt
-- strict thread matches above, loose matches on Subject: below --
2009-03-02 23:08 John Dlugosz
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=49ACDD17.2060601@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=JDlugosz@TradeStation.com \
--cc=bdonlan@gmail.com \
--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 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.