From: Catalin Marinas <catalin.marinas@gmail.com>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: Linus Torvalds <torvalds@osdl.org>,
Junio C Hamano <junkio@cox.net>,
git@vger.kernel.org
Subject: Re: Patch (apply) vs. Pull
Date: Fri, 24 Jun 2005 14:41:46 +0100 [thread overview]
Message-ID: <tnxvf4350th.fsf@arm.com> (raw)
In-Reply-To: <Pine.LNX.4.21.0506231245560.30848-100000@iabervon.org> (Daniel Barkalow's message of "Thu, 23 Jun 2005 13:05:03 -0400 (EDT)")
Daniel Barkalow <barkalow@iabervon.org> wrote:
> I think that it's important to avoid having the array of "rebased the
> patch" commits be reachable from the final series if that series is going
> to be merged into the mainline at the end.
True. I will remove that. Any commit will have the new base of the
patch as a parent.
> If you want to keep the history of a patch, you should be able to do it by
> rebasing that history as well as the latest patch, so you'd get a
> two-parent commit with two rebased parents when you rebased a two-parent
> commit.
I can have two commits, one of them accessible via HEAD and the other
stored somewhere under .git/patches. The latter is just a normal
commit where the parent is the current HEAD. This will not be
generated when the patch is re-based, but only when a patch is
modified.
--
Catalin
next prev parent reply other threads:[~2005-06-24 13:37 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-20 16:19 Patch (apply) vs. Pull Darrin Thompson
2005-06-20 17:22 ` Junio C Hamano
2005-06-20 23:01 ` Darrin Thompson
2005-06-21 18:02 ` Daniel Barkalow
2005-06-22 8:47 ` Junio C Hamano
2005-06-22 9:56 ` Catalin Marinas
2005-06-21 22:09 ` Linus Torvalds
2005-06-22 9:08 ` Junio C Hamano
2005-06-22 17:21 ` Linus Torvalds
2005-06-22 20:08 ` Daniel Barkalow
2005-06-22 20:22 ` Linus Torvalds
2005-06-22 21:54 ` Daniel Barkalow
2005-06-22 22:21 ` Linus Torvalds
2005-06-23 3:32 ` Daniel Barkalow
2005-06-23 4:23 ` Linus Torvalds
2005-06-23 5:15 ` Daniel Barkalow
2005-06-23 6:09 ` Linus Torvalds
2005-06-23 16:45 ` Daniel Barkalow
2005-06-23 18:43 ` Linus Torvalds
2005-06-23 19:59 ` Daniel Barkalow
2005-06-23 22:20 ` Linus Torvalds
2005-06-23 22:49 ` Linus Torvalds
2005-06-23 12:10 ` Catalin Marinas
2005-06-23 17:05 ` Daniel Barkalow
2005-06-24 13:41 ` Catalin Marinas [this message]
2005-06-23 8:47 ` Martin Langhoff
2005-06-22 16:23 ` Darrin Thompson
2005-06-23 8:36 ` Martin Langhoff
2005-06-23 23:21 ` [PATCH 0/3] Rebasing for "individual developer" usage Junio C Hamano
2005-06-23 23:27 ` [PATCH 1/3] git-commit-script: get commit message from an existing one Junio C Hamano
2005-06-23 23:28 ` [PATCH 2/3] git-cherry: find commits not merged upstream Junio C Hamano
2005-06-23 23:29 ` [PATCH 3/3] git-rebase-script: rebase local commits to new upstream head Junio C Hamano
2005-06-22 17:04 ` Patch (apply) vs. Pull Catalin Marinas
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=tnxvf4350th.fsf@arm.com \
--to=catalin.marinas@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=torvalds@osdl.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).