summaryrefslogtreecommitdiff
path: root/Documentation/merge-pull-opts.txt
AgeCommit message (Expand)AuthorFilesLines
2005-11-04Document the --no-commit flag betterLibravatar Junio C Hamano1-1/+2
2005-11-04Documentation: -merge and -pull: describe merge strategies.Libravatar Junio C Hamano1-0/+13