diff options
Diffstat (limited to 'third_party/git/Documentation/config/pull.txt')
| -rw-r--r-- | third_party/git/Documentation/config/pull.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/git/Documentation/config/pull.txt b/third_party/git/Documentation/config/pull.txt index 5404830609..b87cab31b3 100644 --- a/third_party/git/Documentation/config/pull.txt +++ b/third_party/git/Documentation/config/pull.txt @@ -14,16 +14,15 @@ pull.rebase:: pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis. + -When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase' +When `merges`, pass the `--rebase-merges` option to 'git rebase' so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When `preserve` (or just 'p', deprecated in favor of `merges`), also pass +When `preserve` (deprecated in favor of `merges`), also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. + -When the value is `interactive` (or just 'i'), the rebase is run in interactive -mode. +When the value is `interactive`, the rebase is run in interactive mode. + *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] |