diff options
| author |  Jonathan Nieder <jrnieder@uchicago.edu> | 2008-07-03 00:41:41 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-05 11:24:40 -0700 |
| commit | ba020ef5eb5fca3d757bd580ff117adaf81ca079 (patch) | |
| tree | 974c4e60c9bc212d0ce939b31e8fbb61b5fb1f07 /Documentation/git-merge-index.txt | |
| parent | manpages: italicize command names (diff) | |
| download | tgif-ba020ef5eb5fca3d757bd580ff117adaf81ca079.tar.xz | |
manpages: italicize git command names (which were in teletype font)
The names of git commands are not meant to be entered at the
commandline; they are just names. So we render them in italics,
as is usual for command names in manpages.
Using
doit () {
perl -e 'for (<>) { s/\`(git-[^\`.]*)\`/'\''\1'\''/g; print }'
}
for i in git*.txt config.txt diff*.txt blame*.txt fetch*.txt i18n.txt \
merge*.txt pretty*.txt pull*.txt rev*.txt urls*.txt
do
doit <"$i" >"$i+" && mv "$i+" "$i"
done
git diff
.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
| -rw-r--r-- | Documentation/git-merge-index.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 4f04bbb1aa..5ebed57be3 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -36,14 +36,14 @@ OPTIONS failure usually indicates conflicts during merge). This is for porcelains which might want to emit custom messages. -If `git-merge-index` is called with multiple <file>s (or -a) then it +If 'git-merge-index' is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. Typically this is run with a script calling git's imitation of the 'merge' command from the RCS package. -A sample script called `git-merge-one-file` is included in the +A sample script called 'git-merge-one-file' is included in the distribution. ALERT ALERT ALERT! The git "merge object order" is different from the @@ -68,10 +68,10 @@ or This is added AA in the branch B. fatal: merge program failed -where the latter example shows how `git-merge-index` will stop trying to +where the latter example shows how 'git-merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus -`git-merge-index` didn't even try to merge the MM thing). +'git-merge-index' didn't even try to merge the MM thing). Author ------ |