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-file.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-file.txt')
| -rw-r--r-- | Documentation/git-merge-file.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 2a418175ac..6e70ea4923 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -15,15 +15,15 @@ SYNOPSIS DESCRIPTION ----------- -`git-file-merge` incorporates all changes that lead from the `<base-file>` +'git-file-merge' incorporates all changes that lead from the `<base-file>` to `<other-file>` into `<current-file>`. The result ordinarily goes into -`<current-file>`. `git-merge-file` is useful for combining separate changes +`<current-file>`. 'git-merge-file' is useful for combining separate changes to an original. Suppose `<base-file>` is the original, and both `<current-file>` and `<other-file>` are modifications of `<base-file>`. -Then `git-merge-file` combines both changes. +Then 'git-merge-file' combines both changes. A conflict occurs if both `<current-file>` and `<other-file>` have changes -in a common segment of lines. If a conflict is found, `git-merge-file` +in a common segment of lines. If a conflict is found, 'git-merge-file' normally outputs a warning and brackets the conflict with <<<<<<< and >>>>>>> lines. A typical conflict will look like this: @@ -39,7 +39,7 @@ the alternatives. The exit value of this program is negative on error, and the number of conflicts otherwise. If the merge was clean, the exit value is 0. -`git-merge-file` is designed to be a minimal clone of RCS `merge`; that is, it +'git-merge-file' is designed to be a minimal clone of RCS `merge`; that is, it implements all of RCS merge's functionality which is needed by linkgit:git[1]. |