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

Merge 'pull-rebase-interactive' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2015-08-30 18:50:23 +02:00
parent c0fddd517d e1b12a400e
commit e00a30791f
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/config.txt
View File

@@ -863,6 +863,7 @@ branch.<name>.rebase::
instead of merging the default branch from the default remote when
"git pull" is run. See "pull.rebase" for doing this in a non
branch-specific manner.
When the value is `interactive`, the rebase is run in interactive mode.
+
When preserve, also pass `--preserve-merges` along to 'git rebase'
so that locally committed merge commits will not be flattened

4
Documentation/git-pull.txt
View File

@@ -101,7 +101,7 @@ Options related to merging
include::merge-options.txt[]
-r::
--rebase[=false|true|preserve]::
--rebase[=false|true|preserve|interactive]::
When true, 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
@@ -113,6 +113,8 @@ to `git rebase` so that locally created merge commits will not be flattened.
+
When false, merge the current branch into the upstream branch.
+
When `interactive`, enable the interactive mode of rebase.
+
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.