From: "Alex Riesen" <raa.lkml@gmail.com>
To: "linux@horizon.com" <linux@horizon.com>
Cc: git@vger.kernel.org, kernel-hacker@bennee.com
Subject: Re: Merging commits together into a super-commit
Date: Fri, 11 May 2007 13:54:14 +0200 [thread overview]
Message-ID: <81b0412b0705110454w5b18c267x17e82453e736f0b8@mail.gmail.com> (raw)
In-Reply-To: <20070510215515.3084.qmail@science.horizon.com>
On 10 May 2007 17:55:15 -0400, linux@horizon.com <linux@horizon.com> wrote:
> Er... why is everyone making this so complex?
>
> git checkout trunk # Switch to "trunk"
> git checkout branch . # Overwrite with "branch", but stay on "trunk"
> git commit
>
> Now branch is the same tree object as "branch", but without the history.
>
> Of course, you could be even nastier and di a direct
>
> git-commit-tree branch^{tree} -p HEAD < commit_message
>
And it is not enough. Authorship information is lost. And you
have to be damn sure the "branch" starts directly at HEAD,
otherwise everything HEAD..branch is lost. It is complex
if you want it right.
next prev parent reply other threads:[~2007-05-11 11:54 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-10 21:55 Merging commits together into a super-commit linux
2007-05-11 11:54 ` Alex Riesen [this message]
[not found] ` <9909dee80705110537j7e6d1426p7723c110c0a2c667@mail.gmail.com>
2007-05-11 12:41 ` Eugine Kosenko
2007-05-12 13:02 ` Jan Hudec
-- strict thread matches above, loose matches on Subject: below --
2007-05-10 10:51 Alex Bennee
2007-05-10 11:19 ` Raimund Bauer
2007-05-10 11:32 ` Alex Bennee
2007-05-10 11:43 ` Johannes Schindelin
2007-05-10 11:40 ` Johannes Sixt
2007-05-10 16:01 ` Linus Torvalds
2007-05-10 16:57 ` Carl Worth
2007-05-10 17:14 ` J. Bruce Fields
2007-05-10 18:30 ` Carl Worth
2007-05-10 19:21 ` Petr Baudis
2007-05-10 19:48 ` Carl Worth
2007-05-10 20:29 ` Robin Rosenberg
2007-05-12 11:34 ` Yann Dirson
2007-05-12 13:59 ` Jakub Narebski
2007-05-12 14:02 ` Karl Hasselström
2007-05-12 14:41 ` Yann Dirson
2007-05-12 17:03 ` Karl Hasselström
2007-05-12 19:27 ` Junio C Hamano
2007-05-13 18:43 ` Karl Hasselström
2007-05-13 19:35 ` Yann Dirson
2007-05-10 19:22 ` J. Bruce Fields
2007-05-10 19:47 ` Petr Baudis
2007-05-10 19:51 ` J. Bruce Fields
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=81b0412b0705110454w5b18c267x17e82453e736f0b8@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=kernel-hacker@bennee.com \
--cc=linux@horizon.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).