diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:00:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:00:43 -0800 |
| commit | 0ebd5d7186237663a642397214232e5fe2fba21d (patch) | |
| tree | c94682d4abf341bdc6df2785b73faa6e796ff045 /Documentation/git-pull.txt | |
| parent | Merge branch 'wc/rebase-insn' (diff) | |
| parent | Teach 'git pull' about --rebase (diff) | |
| download | tgif-0ebd5d7186237663a642397214232e5fe2fba21d.tar.xz | |
Merge branch 'js/pull-rebase'
* js/pull-rebase:
Teach 'git pull' about --rebase
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index e1eb2c1d00..d4d26afea0 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/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 ----------------- |