| commit | ccef66b55a6a2eb2c5f6a9dd29a86b181df21af9 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 7 Jun 2005 21:35:43 +0000 (7 14:35 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Tue, 7 Jun 2005 22:13:24 +0000 (7 15:13 -0700) | ||
| tree | 890f8ec9e9237761e71beed89f4f393243464a32 | treesnapshot (tar.gz zip) |
| parent | d4f8b390a4326625f0c3d65a8d120336e38928d7 | commitdiff |
[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>
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 | diffblobblamehistory |