diff options
| -rw-r--r-- | using-git.texinfo | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo index f6e7747..61627ab 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -865,7 +865,7 @@ it has some caveats. GNU Arch keeps track files by giving them unique identifier, this solves the problem were you in -git can get an evil merge if +Git can get an evil merge if the pulled branch does not have any common commits@footnote{Identified with commit ID, not snapshots, |