From 4ee8ed272948a53522c6e4e6e8e2fa66e7b17c30 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 18 Sep 2013 09:08:21 +0200 Subject: add fast forward (in addition to 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 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'using-git.texinfo') diff --git a/using-git.texinfo b/using-git.texinfo index 8271442..ed75996 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -2035,6 +2035,11 @@ appear in any parent. Variable name conflicts can be a cause of evil merges. This is why you do not rebase your commits. +@item fast forward +The action of doing a fast-forward merge, +a pull for updates when git branch is just +behind, not diverged. + @item fast-forward A special type of merge that will often be the case when you pull updates from a remote -- cgit v1.2.3-70-g09d2