diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-19 17:55:46 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-19 17:55:46 +0200 |
| commit | 15453763d1bba228c7446e33a2ff2a1bf15ae0d4 (patch) | |
| tree | b1ee8693e3a86d4f5855eee04cdc5517ae08632c /using-git.texinfo | |
| parent | prefer working tree over working dir (diff) | |
| download | using-git-15453763d1bba228c7446e33a2ff2a1bf15ae0d4.tar.gz using-git-15453763d1bba228c7446e33a2ff2a1bf15ae0d4.tar.bz2 using-git-15453763d1bba228c7446e33a2ff2a1bf15ae0d4.tar.xz | |
m
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
| -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, |