diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-12-03 09:57:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-12-03 09:57:55 +0000 |
| commit | 0c99970a28e8702164d721f718aab95a0f23e1b4 (patch) | |
| tree | 56df521f32bb95d2f9d4f940f2ff20815b1bd9e2 /git-pull.txt | |
| parent | 0a16b951976d8a06e3f3ba341c2c2eef7541a65e (diff) | |
| download | git-htmldocs-0c99970a28e8702164d721f718aab95a0f23e1b4.tar.gz | |
Autogenerated HTML docs for v1.5.3.7-994-g36863
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-pull.txt b/git-pull.txt index e1eb2c1d0..d4d26afea 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -33,6 +33,16 @@ include::urls-remotes.txt[] include::merge-strategies.txt[] +\--rebase:: + Instead of a merge, perform a rebase after fetching. + *NOTE:* This is a potentially _dangerous_ mode of operation. + It rewrites history, which does not bode well when you + published that history already. Do *not* use this option + unless you have read gitlink:git-rebase[1] carefully. + +\--no-rebase:: + Override earlier \--rebase. + DEFAULT BEHAVIOUR ----------------- |