diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-01-15 06:12:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-01-15 06:12:45 +0000 |
| commit | edd2b0a4fa552d711bcf7561dead9c6c87146701 (patch) | |
| tree | e80c32034830f1b7e1d426c595e242567eccc386 /git-pull.txt | |
| parent | ffaf0e26d2f1796fd1763b4a8817b8f12339bace (diff) | |
| download | git-htmldocs-edd2b0a4fa552d711bcf7561dead9c6c87146701.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc1-g5fe3
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt index 13be99200..a90b764cc 100644 --- a/git-pull.txt +++ b/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, |