Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase
From: Johannes Sixt <hidden>
Date: 2016-06-15 22:52:23
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase · Ævar Arnfjörð Bjarmason <hidden>
- 2016-06-15 · Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase · Junio C Hamano <hidden>
Am 06.11.2011 10:50, schrieb Ævar Arnfjörð Bjarmason:
quoted hunk ↗ jump to hunk
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5a841da..b2d7d92 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt@@ -677,7 +677,9 @@ branch.<name>.mergeoptions:: branch.<name>.rebase:: When true, rebase the branch <name> on top of the fetched branch, instead of merging the default branch from the default remote when - "git pull" is run. + "git pull" is run. See "pull.rebase" for doing this in a non + branch-specific manner. + *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] for details).
When you continue an indented item in a separate paragraph, then you must not use an empty line, but have line with '+' and un-indented continuation paragraphs. See examples in this file. -- Hannes