aboutsummaryrefslogtreecommitdiff
path: root/Documentation/pull-fetch-param.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-04 00:06:20 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-04 00:18:29 -0800
commit3746501664e3fcf6c44080cb599b50bf9cbea2be (patch)
treed032e26b9d623a605fb9f8941e96ad62a7344aa3 /Documentation/pull-fetch-param.txt
parent810bf1f9448c1db7f52cfa43c077c677fb080fce (diff)
downloadgit-3746501664e3fcf6c44080cb599b50bf9cbea2be.tar.gz
git-3746501664e3fcf6c44080cb599b50bf9cbea2be.tar.xz
Documentation: -merge and -pull: describe merge strategies.
... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/pull-fetch-param.txt')
0 files changed, 0 insertions, 0 deletions