diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-03 20:39:47 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-03 20:39:47 +0200 |
| commit | 34c7e2a7879fb905ad15e9ce18d1e1979a42aa5b (patch) | |
| tree | 774f4cfa268f4a74b8e537de7ee17625e34e49dc | |
| parent | add dirty to glossary (diff) | |
| download | using-git-34c7e2a7879fb905ad15e9ce18d1e1979a42aa5b.tar.gz using-git-34c7e2a7879fb905ad15e9ce18d1e1979a42aa5b.tar.bz2 using-git-34c7e2a7879fb905ad15e9ce18d1e1979a42aa5b.tar.xz | |
add evil merge to glossary
Signed-off-by: Mattias Andrée <maandree@operamail.com>
| -rw-r--r-- | using-git.texinfo | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo index e796f86..31739c3 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1348,7 +1348,12 @@ with the command @command{cd}. The working tree is dirty if it contains uncommited modifications. -@c @item evil merge +@item evil merge +A merge that introduces changes that do not +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 @c @item fetch @c @item gitfile |