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