diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-08-22 20:18:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-22 20:18:37 -0700 |
commit | bc38219f50ba9228945fba8e900d636f15082f16 (patch) | |
tree | 06e090679892d927c141aac808b37a49de52466e /Documentation/howto/revert-a-faulty-merge.txt | |
parent | Typos in code comments, an error message, documentation (diff) | |
parent | Typos in code comments, an error message, documentation (diff) | |
download | tgif-bc38219f50ba9228945fba8e900d636f15082f16.tar.xz |
Merge branch 'maint'
* maint:
Typos in code comments, an error message, documentation
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 ff5c0bc27a..6fd711996a 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 |