diff options
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-08-22 13:12:12 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-22 13:25:08 -0700 |
commit | 22e5e58a3c75b73764b860907e4d871195f276ac (patch) | |
tree | 7c0670afe68e908bb829347268bba9a771b78e84 /Documentation/howto/revert-a-faulty-merge.txt | |
parent | 0eb032d86c99ac8f23435ad5ea9f2b83f1be744f (diff) | |
download | git-22e5e58a3c75b73764b860907e4d871195f276ac.tar.gz git-22e5e58a3c75b73764b860907e4d871195f276ac.tar.xz |
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/revert-a-faulty-merge.txt')
-rw-r--r-- | Documentation/howto/revert-a-faulty-merge.txt | 2 |
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 ff5c0bc27..6fd711996 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 |