global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-17 21:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Teach 'git pull' to handle --rebase=interactive

Browse Source 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2011-10-21 23:27:09 -05:00
committed by Pat Thoyts
parent 1f42fa109e
commit 75e48eeffd
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-pull.txt
View File

@@ -102,13 +102,16 @@ include::merge-options.txt[]
:git-pull: 1
-r::
--rebase::
--rebase[=interactive]::
Rebase the current branch on top of the upstream branch after
fetching. If there is a remote-tracking branch corresponding to
the upstream branch and the upstream branch was rebased since last
fetched, the rebase uses that information to avoid rebasing
non-local changes.
+
The optional mode `interactive` tells Git to switch on rebase's interactive
mode.
+
See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in
linkgit:git-config[1] if you want to make `git pull` always use
`--rebase` instead of merging.