diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-03 20:48:07 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-03 20:48:07 +0200 |
| commit | 9877f7c565f1664bdb4c73ff3956da18bfd63454 (patch) | |
| tree | 8b3ace270213e8199668dde9070ca6782750c708 /using-git.texinfo | |
| parent | add evil merge to glossary (diff) | |
| download | using-git-9877f7c565f1664bdb4c73ff3956da18bfd63454.tar.gz using-git-9877f7c565f1664bdb4c73ff3956da18bfd63454.tar.bz2 using-git-9877f7c565f1664bdb4c73ff3956da18bfd63454.tar.xz | |
add 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 | 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 |