summaryrefslogtreecommitdiff
path: root/Documentation/merge-pull-opts.txt
AgeCommit message (Collapse)AuthorFilesLines
2005-11-04Document the --no-commit flag betterLibravatar Junio C Hamano1-1/+2
Pasky and I did overlapping documentation independently; this is to pick up better wordings from what he sent me. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-04Documentation: -merge and -pull: describe merge strategies.Libravatar Junio C Hamano1-0/+13
... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano <junkio@cox.net>