summaryrefslogtreecommitdiff
path: root/Documentation/git-rerere.txt
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2007-01-17 15:32:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-17 16:44:32 (GMT)
commit23bfbb815d7d71ff20c014f4610732597f0a75db (patch)
tree69a5f28bb990dfb8f5871972c1bac4c9ab0e3cb6 /Documentation/git-rerere.txt
parent850844e28f728625ba96b7880a0a264a5578e4c6 (diff)
downloadgit-23bfbb815d7d71ff20c014f4610732597f0a75db.zip
git-23bfbb815d7d71ff20c014f4610732597f0a75db.tar.gz
git-23bfbb815d7d71ff20c014f4610732597f0a75db.tar.bz2
Documentation: a few spelling fixes
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rerere.txt')
-rw-r--r--Documentation/git-rerere.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 08a0557..c65c59e 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -38,7 +38,7 @@ its working state.
This resets the metadata used by rerere if a merge resolution is to be
is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
-[--skip|--abort] will automatcally invoke this command.
+[--skip|--abort] will automatically invoke this command.
'diff'::