Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt > index 5c3fb67c01..7f4b2d1982 100644 > --- a/Documentation/git-pull.txt > +++ b/Documentation/git-pull.txt > @@ -117,7 +117,7 @@ When set to `preserve` (deprecated in favor of `merges`), rebase with the > `--preserve-merges` option passed to `git rebase` so that locally created > merge commits will not be flattened. > + > -When false, merge the current branch into the upstream branch. > +When false, merge the upstream branch into the current branch. > + > When `interactive`, enable the interactive mode of rebase. > + Looks correct. Will queue. Thanks.
