diff options
Diffstat (limited to '')
| -rw-r--r-- | using-git.texinfo | 9 |
1 files changed, 8 insertions, 1 deletions
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 |