diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
| commit | eb415999b469f6d3e718f2fdf28dd460d8db5f4f (patch) | |
| tree | ca4b12fcea8cc51c42b66ee456255ee4ea85b203 /git-pull.txt | |
| parent | e2b205c118b67a65b1bde35ff88de1f7aceae8d0 (diff) | |
| download | git-htmldocs-eb415999b469f6d3e718f2fdf28dd460d8db5f4f.tar.gz | |
Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-pull.txt b/git-pull.txt index 5c522ced9..5f55f6494 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -30,7 +30,7 @@ include::merge-options.txt[] :git-pull: 1 -\--rebase:: +--rebase:: Instead of a merge, perform a rebase after fetching. If there is a remote ref for the upstream branch, and this branch was rebased since last fetched, the rebase uses that information @@ -43,8 +43,8 @@ It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully. -\--no-rebase:: - Override earlier \--rebase. +--no-rebase:: + Override earlier --rebase. include::fetch-options.txt[] |