| commit | 44760f1d559ae2087e53be6971ad4f1a8f18f1d7 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 7 Nov 2005 07:29:35 +0000 (6 23:29 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 7 Nov 2005 07:32:33 +0000 (6 23:32 -0800) | ||
| tree | 14e7e66d6c04bef067999ade2d0e3ee01495975d | treesnapshot (tar.gz zip) |
| parent | 93d69d86912c44206543f6670e93f9fc6f2f859f | commitdiff |
Documentation: talk about guts of merge in tutorial.
While discussing Jon's ASCII art on merge operations with him, I
realized that the tutorial stops talking about the plumbing
details halfway. So fill in the gory details, and update the
examples to use 'git-merge', not 'git-resolve'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
While discussing Jon's ASCII art on merge operations with him, I
realized that the tutorial stops talking about the plumbing
details halfway. So fill in the gory details, and update the
examples to use 'git-merge', not 'git-resolve'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/tutorial.txt | diffblobblamehistory |