diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-01-27 08:23:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-01-27 08:23:46 +0000 |
| commit | f7bb669c0b2263dd46cbcf60527b88293ae0bfd1 (patch) | |
| tree | c2a3399d23ce54078ed6fef864481b266d9384fc /git-pull.txt | |
| parent | ebc53dcb88aa848843f12d4f9c14910e3b763613 (diff) | |
| download | git-htmldocs-f7bb669c0b2263dd46cbcf60527b88293ae0bfd1.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc5
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt index 77fdaf146..4cc633a5e 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -25,6 +25,7 @@ OPTIONS ------- include::merge-options.txt[] +:git-pull: 1 include::fetch-options.txt[] include::pull-fetch-param.txt[] @@ -34,7 +35,11 @@ include::urls-remotes.txt[] include::merge-strategies.txt[] \--rebase:: - Instead of a merge, perform a rebase after fetching. + 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 + to avoid rebasing non-local changes. + *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 |