From 15453763d1bba228c7446e33a2ff2a1bf15ae0d4 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 19 Sep 2013 17:55:46 +0200 Subject: m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- cgit v1.2.3-70-g09d2