projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 93d69d8) | patch
Documentation: talk about guts of merge in tutorial.
authorJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 07:29:35 +0000 (23:29 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 07:32:33 +0000 (23:32 -0800)
commit44760f1d559ae2087e53be6971ad4f1a8f18f1d7
tree14e7e66d6c04bef067999ade2d0e3ee01495975dtree | snapshot
parent93d69d86912c44206543f6670e93f9fc6f2f859fcommit | diff
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>
Documentation/tutorial.txt diff | blob | history
The core git plumbing