diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-01-07 17:49:12 +0100 |
|---|---|---|
| committer | Thomas Rast <trast@student.ethz.ch> | 2010-01-10 13:01:25 +0100 |
| commit | ca768288b650a4929bc1d58783a929a9a792e30e (patch) | |
| tree | aeb3937cf3f137cb8aeabeb74b11eb3c0e34bf37 /Documentation/git-merge.txt | |
| parent | e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c (diff) | |
| download | git-ca768288b650a4929bc1d58783a929a9a792e30e.tar.gz | |
Documentation: format full commands in typewriter font
Use `code snippet` style instead of 'emphasis' for `git cmd ...`
according to the following rules:
* The SYNOPSIS sections are left untouched.
* If the intent is that the user type the command exactly as given, it
is `code`.
If the user is only loosely referred to a command and/or option, it
remains 'emphasised'.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 3277f4e26d..04c21d33cf 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -193,7 +193,7 @@ After seeing a conflict, you can do two things: * Decide not to merge. The only clean-ups you need are to reset the index file to the `HEAD` commit to reverse 2. and to clean - up working tree changes made by 2. and 3.; 'git-reset --hard' can + up working tree changes made by 2. and 3.; `git-reset --hard` can be used for this. * Resolve the conflicts. Git will mark the conflicts in @@ -202,19 +202,19 @@ After seeing a conflict, you can do two things: You can work through the conflict with a number of tools: - * Use a mergetool. 'git mergetool' to launch a graphical + * Use a mergetool. `git mergetool` to launch a graphical mergetool which will work you through the merge. - * Look at the diffs. 'git diff' will show a three-way diff, + * Look at the diffs. `git diff` will show a three-way diff, highlighting changes from both the HEAD and their versions. - * Look at the diffs on their own. 'git log --merge -p <path>' + * Look at the diffs on their own. `git log --merge -p <path>` will show diffs first for the HEAD version and then their version. - * Look at the originals. 'git show :1:filename' shows the - common ancestor, 'git show :2:filename' shows the HEAD - version and 'git show :3:filename' shows their version. + * Look at the originals. `git show :1:filename` shows the + common ancestor, `git show :2:filename` shows the HEAD + version and `git show :3:filename` shows their version. EXAMPLES |