From: Junio C Hamano <junkio@cox.net>
To: Petr Baudis <pasky@ucw.cz>
Cc: Linus Torvalds <torvalds@osdl.org>, git@vger.kernel.org
Subject: [PATCH 0/4] Merging merge-trees changes to pasky-0.4
Date: Thu, 14 Apr 2005 23:00:28 -0700 [thread overview]
Message-ID: <7vr7hco9z7.fsf@assigned-by-dhcp.cox.net> (raw)
I finally sync'ed up with Pasky 0.4. Reviewing the diffs
between Linus tree and Pasky tree for the core part you seem to
have picked up some good changes (especially the byteorder one),
so I decided to rebase my changes. So here it comes...
What follows are the 3 patches to the core part to support the
three-tree merge script, and another to introduce the script
itself. I used to call it git-merge.perl, but now it is called
merge-trees (per request from Pasky to drop git- prefix, and
Linus has merge-tree that does not recurse while this one does
subdirectories). The core functinality has not changed much.
The changes from the previous version at this point is still
code and interface cleanup only.
My next step will be to make it possible to tell it not to do
anything but just output recipe.
[PATCH 1/4] Add --cacheinfo option to update-cache
[PATCH 2/4] Add -z option to show-files
[PATCH 3/4] Add -r and -z options to ls-tree
[PATCH 4/4] Makefile change and merge-trees script itself.
The patches are against 516f2a088903a7b5f5a542de96b6a70c17856314
next reply other threads:[~2005-04-15 5:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-15 6:00 Junio C Hamano [this message]
2005-04-15 6:03 ` [PATCH 1/4] Add --cacheinfo option to update-cache Junio C Hamano
2005-04-15 6:04 ` [PATCH 2/4] Add -z option to show-files Junio C Hamano
2005-04-15 6:05 ` [PATCH 3/4] Add -r and -z options to ls-tree Junio C Hamano
2005-04-15 6:06 ` [PATCH 4/4] Makefile change and merge-trees script itself Junio C Hamano
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=7vr7hco9z7.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
--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