[PATCH] doc: pull: improve rebase=false documentation
From: Dragan Simic <hidden>
Date: 2023-09-14 03:25:08
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Mention in the documentation that --rebase defaults to false. Signed-off-by: Dragan Simic <redacted> --- Documentation/git-pull.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 0e14f8b5b2..d28790388e 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt@@ -116,7 +116,8 @@ When set to `merges`, rebase using `git rebase --rebase-merges` so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When false, merge the upstream branch into the current branch. +When false, merge the upstream branch into the current branch. This is +the default. + When `interactive`, enable the interactive mode of rebase. +