projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d4f8b39) | patch
[PATCH] read-tree: update documentation for 3-way merge.
authorJunio C Hamano <junkio@cox.net>
Tue, 7 Jun 2005 21:35:43 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 22:13:24 +0000 (15:13 -0700)
commitccef66b55a6a2eb2c5f6a9dd29a86b181df21af9
tree890f8ec9e9237761e71beed89f4f393243464a32tree | snapshot
parentd4f8b390a4326625f0c3d65a8d120336e38928d7commit | diff
[PATCH] read-tree: update documentation for 3-way merge.

This explains the new merge world order that formally assigns
specific meaning to each of three tree-ish command line
arguments.  It also mentions -u option

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Documentation/git-read-tree.txt diff | blob | history
The core git plumbing