diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-18 09:08:21 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-18 09:08:21 +0200 |
| commit | 4ee8ed272948a53522c6e4e6e8e2fa66e7b17c30 (patch) | |
| tree | 1c2005d5172917a7785cdaced659b78abdf0c0ac /using-git.texinfo | |
| parent | add merge to glossary (diff) | |
| download | using-git-4ee8ed272948a53522c6e4e6e8e2fa66e7b17c30.tar.gz using-git-4ee8ed272948a53522c6e4e6e8e2fa66e7b17c30.tar.bz2 using-git-4ee8ed272948a53522c6e4e6e8e2fa66e7b17c30.tar.xz | |
add fast forward (in addition to fast-forward) to glossary
Signed-off-by: Mattias Andrée <maandree@operamail.com>
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 |