summaryrefslogtreecommitdiff
path: root/Documentation/merge-pull-opts.txt
Commit message (Expand)AuthorAgeFilesLines
* Document the --no-commit flag betterJunio C Hamano2005-11-041-1/+2
* Documentation: -merge and -pull: describe merge strategies.Junio C Hamano2005-11-041-0/+13