aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2015-04-08 23:06:55 +0200
committerMattias Andrée <maandree@operamail.com>2015-04-08 23:06:55 +0200
commit74db7bacfaec6ed5506eba27d9ae752bc606bf69 (patch)
tree8f85efbc9d67cd7539f52320a5e193e352164708 /using-git.texinfo
parenttypo (diff)
downloadusing-git-74db7bacfaec6ed5506eba27d9ae752bc606bf69.tar.gz
using-git-74db7bacfaec6ed5506eba27d9ae752bc606bf69.tar.bz2
using-git-74db7bacfaec6ed5506eba27d9ae752bc606bf69.tar.xz
typo
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
-rw-r--r--using-git.texinfo2
1 files changed, 1 insertions, 1 deletions
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}