path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
authorMike Ralphson <>2009-03-03 19:29:22 (GMT)
committerJunio C Hamano <>2009-03-04 05:43:19 (GMT)
commita1070d4cbbf1002cc0b01afc3de06382deb0511a (patch)
treed38bcbf550f7eeaab6575e4804a3697152407d3f /Documentation/howto/revert-a-faulty-merge.txt
parent5a4aaaf3aa2ef02b6b397206cf222643b68b36c7 (diff)
Documentation: Typo / spelling / formatting fixes
Signed-off-by: Mike Ralphson <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt
index 39b1da4..3b4a390 100644
--- a/Documentation/howto/revert-a-faulty-merge.txt
+++ b/Documentation/howto/revert-a-faulty-merge.txt
@@ -39,7 +39,7 @@ Such a "revert" of a merge can be made with:
$ git revert -m 1 M
-After the develpers of the side branch fixes their mistakes, the history
+After the developers of the side branch fix their mistakes, the history
may look like this:
@@ -116,7 +116,7 @@ If you reverted the revert in such a case as in the previous example:
/ \ /
---A---B A'--B'--C'
-where Y is the revert of W, A' and B'are rerolled A and B, and there may
+where Y is the revert of W, A' and B' are rerolled A and B, and there may
also be a further fix-up C' on the side branch. "diff Y^..Y" is similar
to "diff -R W^..W" (which in turn means it is similar to "diff M^..M"),
and "diff A'^..C'" by definition would be similar but different from that,