| Message ID | 20201204061623.1170745-2-felipe.contreras@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | pull: default warning improvements | expand |
On Thu, Dec 3, 2020 at 10:16 PM Felipe Contreras <felipe.contreras@gmail.com> wrote: > > We want users to know what is a fast-forward in order to understand the > default warning. > > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> > --- > Documentation/git-pull.txt | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt > index 5c3fb67c01..dc812139f4 100644 > --- a/Documentation/git-pull.txt > +++ b/Documentation/git-pull.txt > @@ -38,6 +38,20 @@ as set by linkgit:git-branch[1] `--track`. > Assume the following history exists and the current branch is > "`master`": > > +------------ > + A---B---C master on origin > + / > + D---E master > +------------ > + > +Then `git pull` will merge in a fast-foward way up to the new master. > + > +------------ > + D---E---A---B---C master, origin/master > +------------ > + > +However, a non-fast-foward case looks very different. > + > ------------ > A---B---C master on origin > / > -- > 2.29.2 Makes sense to me.
On Thu, Dec 3, 2020 at 10:16 PM Felipe Contreras <felipe.contreras@gmail.com> wrote: > > We want users to know what is a fast-forward in order to understand the > default warning. > > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> > --- > Documentation/git-pull.txt | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt > index 5c3fb67c01..dc812139f4 100644 > --- a/Documentation/git-pull.txt > +++ b/Documentation/git-pull.txt > @@ -38,6 +38,20 @@ as set by linkgit:git-branch[1] `--track`. > Assume the following history exists and the current branch is > "`master`": > > +------------ > + A---B---C master on origin > + / > + D---E master > +------------ > + When displayed in a regular font, this looks like it is pointing at D, but I checked the text using a proper monospaced font (on lore) and it is correctly pointing at E. Makes sense. > +Then `git pull` will merge in a fast-foward way up to the new master. > + > +------------ > + D---E---A---B---C master, origin/master > +------------ > + > +However, a non-fast-foward case looks very different. > + > ------------ > A---B---C master on origin > / > -- > 2.29.2 >
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 5c3fb67c01..dc812139f4 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -38,6 +38,20 @@ as set by linkgit:git-branch[1] `--track`. Assume the following history exists and the current branch is "`master`": +------------ + A---B---C master on origin + / + D---E master +------------ + +Then `git pull` will merge in a fast-foward way up to the new master. + +------------ + D---E---A---B---C master, origin/master +------------ + +However, a non-fast-foward case looks very different. + ------------ A---B---C master on origin /
We want users to know what is a fast-forward in order to understand the default warning. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- Documentation/git-pull.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+)