projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 810bf1f) | patch
Documentation: -merge and -pull: describe merge strategies.
authorJunio C Hamano <junkio@cox.net>
Fri, 4 Nov 2005 08:06:20 +0000 (00:06 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 4 Nov 2005 08:18:29 +0000 (00:18 -0800)
commit3746501664e3fcf6c44080cb599b50bf9cbea2be
treed032e26b9d623a605fb9f8941e96ad62a7344aa3tree | snapshot
parent810bf1f9448c1db7f52cfa43c077c677fb080fcecommit | diff
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>
Documentation/Makefile diff | blob | history
Documentation/git-merge.txt diff | blob | history
Documentation/git-pull.txt diff | blob | history
Documentation/merge-pull-opts.txt [new file with mode: 0644] blob
The core git plumbing