summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-10-14 18:07:50 (GMT)
committerJonathan Nieder <jrnieder@gmail.com>2013-10-14 18:07:50 (GMT)
commit865156a7cb72a579c144220204fd7b447ca4e50f (patch)
tree0e43d15116202baae9c558cfa3b27f9136712b2f /Documentation/howto
parentc766e6f429f48e4e6e7b5609779e6cca501c31f6 (diff)
parent78bef06589dc7570f9b52a6c9fca04d6142cc949 (diff)
downloadgit-865156a7cb72a579c144220204fd7b447ca4e50f.zip
git-865156a7cb72a579c144220204fd7b447ca4e50f.tar.gz
git-865156a7cb72a579c144220204fd7b447ca4e50f.tar.bz2
Merge branch 'rj/doc-formatting-fix'
* rj/doc-formatting-fix: howto/revert-a-faulty-merge: fix unescaped '^'s howto/setup-git-server-over-http: fix unescaped '^'s
Diffstat (limited to 'Documentation/howto')
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt8
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt4
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt
index 075418e..acf3e47 100644
--- a/Documentation/howto/revert-a-faulty-merge.txt
+++ b/Documentation/howto/revert-a-faulty-merge.txt
@@ -37,7 +37,7 @@ where A and B are on the side development that was not so good, M is the
merge that brings these premature changes into the mainline, x are changes
unrelated to what the side branch did and already made on the mainline,
and W is the "revert of the merge M" (doesn't W look M upside down?).
-IOW, "diff W^..W" is similar to "diff -R M^..M".
+IOW, `"diff W^..W"` is similar to `"diff -R M^..M"`.
Such a "revert" of a merge can be made with:
@@ -121,9 +121,9 @@ 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
-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,
+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,
because it is a rerolled series of the earlier change. There will be a
lot of overlapping changes that result in conflicts. So do not do "revert
of revert" blindly without thinking..
diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt
index 7f4943e..981cbdd 100644
--- a/Documentation/howto/setup-git-server-over-http.txt
+++ b/Documentation/howto/setup-git-server-over-http.txt
@@ -81,8 +81,8 @@ Initialize a bare repository
$ git --bare init
-Change the ownership to your web-server's credentials. Use "grep ^User
-httpd.conf" and "grep ^Group httpd.conf" to find out:
+Change the ownership to your web-server's credentials. Use `"grep ^User
+httpd.conf"` and `"grep ^Group httpd.conf"` to find out:
$ chown -R www.www .