summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-08-22 11:12:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-22 20:25:08 (GMT)
commit22e5e58a3c75b73764b860907e4d871195f276ac (patch)
tree7c0670afe68e908bb829347268bba9a771b78e84 /Documentation/howto
parent0eb032d86c99ac8f23435ad5ea9f2b83f1be744f (diff)
downloadgit-22e5e58a3c75b73764b860907e4d871195f276ac.zip
git-22e5e58a3c75b73764b860907e4d871195f276ac.tar.gz
git-22e5e58a3c75b73764b860907e4d871195f276ac.tar.bz2
Typos in code comments, an error message, documentation
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto')
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt
index ff5c0bc..6fd7119 100644
--- a/Documentation/howto/revert-a-faulty-merge.txt
+++ b/Documentation/howto/revert-a-faulty-merge.txt
@@ -229,7 +229,7 @@ reverting W. Mainline's history would look like this:
A---B---C
But if you don't actually need to change commit A, then you need some way to
-recreate it as a new commit with the same changes in it. The rebase commmand's
+recreate it as a new commit with the same changes in it. The rebase command's
--no-ff option provides a way to do this:
$ git rebase [-i] --no-ff P