summaryrefslogtreecommitdiff
path: root/Documentation/howto/using-topic-branches.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-07 07:29:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-07 07:32:33 (GMT)
commit44760f1d559ae2087e53be6971ad4f1a8f18f1d7 (patch)
tree14e7e66d6c04bef067999ade2d0e3ee01495975d /Documentation/howto/using-topic-branches.txt
parent93d69d86912c44206543f6670e93f9fc6f2f859f (diff)
downloadgit-44760f1d559ae2087e53be6971ad4f1a8f18f1d7.zip
git-44760f1d559ae2087e53be6971ad4f1a8f18f1d7.tar.gz
git-44760f1d559ae2087e53be6971ad4f1a8f18f1d7.tar.bz2
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>
Diffstat (limited to 'Documentation/howto/using-topic-branches.txt')
0 files changed, 0 insertions, 0 deletions