From 9877f7c565f1664bdb4c73ff3956da18bfd63454 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 3 Sep 2013 20:48:07 +0200 Subject: add fast-forward to glossary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/using-git.texinfo b/using-git.texinfo index 31739c3..90e16d2 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1354,7 +1354,14 @@ appear in any parent. Variable name conflicts can be a cause of evil merges. This is why you do not rebase your commits. -@c @item fast-forward +@item fast-forward +A special type of merge that will often be +the case when you pull updates from a remote +repository. A fast-forward merge is a merge +where you have made no changes but there +are changes on the remote-tracking branch +that can be pulled without any merge logic. + @c @item fetch @c @item gitfile @c @item grafts -- cgit v1.2.3-70-g09d2