git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/4] Merging merge-trees changes to pasky-0.4

From
Junio C Hamano <junkio@cox.net>
Date
Apr 15, 2005, 06:00 UTC
Message-ID
<7vr7hco9z7.fsf@assigned-by-dhcp.cox.net>

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: Junio C Hamano
Message 1 of 5 in “Merging merge-trees changes to pasky-0.4”
  1. 0/4 Merging merge-trees changes to pasky-0.4Junio C Hamano, Apr 15, 2005
  2. 1/4 Add --cacheinfo option to update-cacheJunio C Hamano, Apr 15, 2005
  3. 2/4 Add -z option to show-filesJunio C Hamano, Apr 15, 2005
  4. 3/4 Add -r and -z options to ls-treeJunio C Hamano, Apr 15, 2005
  5. 4/4 Makefile change and merge-trees script itself.Junio C Hamano, Apr 15, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.