From 74db7bacfaec6ed5506eba27d9ae752bc606bf69 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 8 Apr 2015 23:06:55 +0200 Subject: typo 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(-) (limited to 'using-git.texinfo') diff --git a/using-git.texinfo b/using-git.texinfo index 808b97f..04fe7aa 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1419,7 +1419,7 @@ git branch -m mergee unsquashed-mergee But the complicated part is when you want to squash a set of commits without -mergine them into another branch. +merging them into another branch. To do this you need to create a temporary branch and merge into it. Assume that you have then branches @code{squashthis} -- cgit v1.2.3-70-g09d2