All of lore.kernel.org
 help / color / mirror / Atom feed
* git history in a file
@ 2015-07-24 12:16 Josh Boyer
  2015-07-24 12:46 ` Andreas Schwab
  0 siblings, 1 reply; 3+ messages in thread
From: Josh Boyer @ 2015-07-24 12:16 UTC (permalink / raw)
  To: Git Mailing List

Hello,

I'm trying to figure out how to generate a file that contains the git
history and changes from one revision to another, such that when the
file is applied to a different tree starting at the same ancestor, the
resulting tree is identical.

E.g. git <whatever> v4.2-rc3..master

would produce this file, and then:

git <apply whatever> <file>

run on a tree which is currently at 4.2-rc3 would result in an identical HEAD.

Originally I thought git-format-patch would be sufficient, however it
does not contain merge commits and the resulting commit shas seem like
they would be inaccurate.  Is there a way to do this?

I realize one could just git fetch/pull from tree A to tree B, but the
usecase here is more complicated.  Please CC me on replies as I am not
subscribed.

josh

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: git history in a file
  2015-07-24 12:16 git history in a file Josh Boyer
@ 2015-07-24 12:46 ` Andreas Schwab
  2015-07-24 13:02   ` Josh Boyer
  0 siblings, 1 reply; 3+ messages in thread
From: Andreas Schwab @ 2015-07-24 12:46 UTC (permalink / raw)
  To: Josh Boyer; +Cc: Git Mailing List

Josh Boyer <jwboyer@fedoraproject.org> writes:

> I'm trying to figure out how to generate a file that contains the git
> history and changes from one revision to another, such that when the
> file is applied to a different tree starting at the same ancestor, the
> resulting tree is identical.

See git-bundle(1).

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: git history in a file
  2015-07-24 12:46 ` Andreas Schwab
@ 2015-07-24 13:02   ` Josh Boyer
  0 siblings, 0 replies; 3+ messages in thread
From: Josh Boyer @ 2015-07-24 13:02 UTC (permalink / raw)
  To: Andreas Schwab; +Cc: Git Mailing List

On Fri, Jul 24, 2015 at 8:46 AM, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Josh Boyer <jwboyer@fedoraproject.org> writes:
>
>> I'm trying to figure out how to generate a file that contains the git
>> history and changes from one revision to another, such that when the
>> file is applied to a different tree starting at the same ancestor, the
>> resulting tree is identical.
>
> See git-bundle(1).

Thanks.  That does indeed seem like what I'm looking for.

josh

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-07-24 13:02 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-24 12:16 git history in a file Josh Boyer
2015-07-24 12:46 ` Andreas Schwab
2015-07-24 13:02   ` Josh Boyer

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.