diff options
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 13be992006..a90b764cc9 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -52,7 +52,8 @@ git pull origin next:: git pull . fixes enhancements:: Bundle local branch `fixes` and `enhancements` on top of - the current branch, making an Octopus merge. + the current branch, making an Octopus merge. This `git pull .` + syntax is equivalent to `git merge`. git pull -s ours . obsolete:: Merge local branch `obsolete` into the current branch, |