diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-07 14:35:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 15:13:24 -0700 |
| commit | ccef66b55a6a2eb2c5f6a9dd29a86b181df21af9 (patch) | |
| tree | 890f8ec9e9237761e71beed89f4f393243464a32 /count-delta.c | |
| parent | d4f8b390a4326625f0c3d65a8d120336e38928d7 (diff) | |
| download | git-ccef66b55a6a2eb2c5f6a9dd29a86b181df21af9.tar.gz git-ccef66b55a6a2eb2c5f6a9dd29a86b181df21af9.tar.xz | |
[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>
Diffstat (limited to 'count-delta.c')
0 files changed, 0 insertions, 0 deletions