summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 04c2407)
raw | patch | inline | side by side (parent: 04c2407)
author | Jonathan Nieder <jrnieder@uchicago.edu> | |
Thu, 3 Jul 2008 05:37:18 +0000 (00:37 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 5 Jul 2008 18:24:39 +0000 (11:24 -0700) |
This includes nongit commands like RCS 'merge'. This patch only
italicizes names of commands if they had no formatting before.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
italicizes names of commands if they had no formatting before.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
index 13b17a5a1ea8ae86406f17f5771f1cb8703dde80..93a6a83b95609f7362a1d2d0bc72ac20988c1d26 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
diff.renameLimit::
The number of files to consider when performing the copy/rename
- detection; equivalent to the git-diff option '-l'.
+ detection; equivalent to the 'git-diff' option '-l'.
diff.renames::
Tells git to detect renames. If set to any boolean value, it
log.date::
Set default date-time mode for the log command. Setting log.date
- value is similar to using git-log's --date option. The value is one of the
+ value is similar to using 'git-log'\'s --date option. The value is one of the
following alternatives: {relative,local,default,iso,rfc,short}.
See linkgit:git-log[1].
index 70d19f63eb562063dd373a4474f6efc0e2ea32dc..b7e51b885c5e7e6134e37bad2c722bc010bdc052 100644 (file)
DESCRIPTION
-----------
-Reads supplied diff output and applies it on a git index file
+Reads supplied 'diff' output and applies it on a git index file
and a work tree.
OPTIONS
* `error-all` is similar to `error` but shows all errors.
--inaccurate-eof::
- Under certain circumstances, some versions of diff do not correctly
+ Under certain circumstances, some versions of 'diff' do not correctly
detect a missing new-line at the end of the file. As a result, patches
- created by such diff programs do not record incomplete lines
+ created by such 'diff' programs do not record incomplete lines
correctly. This option adds support for applying such patches by
working around this bug.
index f057e49951188efa311997e4f79f1ccd480ed1b3..2a418175acbe81d8463a32450210b310c35e3cb9 100644 (file)
Documentation
--------------
Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>,
-with parts copied from the original documentation of RCS merge.
+with parts copied from the original documentation of RCS 'merge'.
GIT
---
index 43680840e15d677ad54ad5de8561dfff4e63662d..4f04bbb1aa573e7092c48add8571fb8203537412 100644 (file)
code.
Typically this is run with a script calling git's imitation of
-the merge command from the RCS package.
+the 'merge' command from the RCS package.
A sample script called `git-merge-one-file` is included in the
distribution.
index ae2b2b543ab9ed9d87019fc72c4fdb189ca72902..30ec68d3ebab25718967f93f66b05560c238f707 100644 (file)
SYNOPSIS
--------
-'git rerere' [clear|diff|status|gc]
+'git rerere' ['clear'|'diff'|'status'|'gc']
DESCRIPTION
-----------
'status'::
-Like diff, but this only prints the filenames that will be tracked
+Like 'diff', but this only prints the filenames that will be tracked
for resolutions.
'gc'::
index 1171b5c604c4fd42e8a491d8df44e7f94c53ea4e..949332b58e430ce6c776fbb2d11c35afa1f70255 100644 (file)
SYNOPSIS
--------
-git diff *
+'git diff' *
DESCRIPTION
-----------
can be told to manipulate differences they find in
unconventional ways before showing `diff` output. The manipulation
is collectively called "diffcore transformation". This short note
-describes what they are and how to use them to produce diff output
+describes what they are and how to use them to produce 'diff' output
that is easier to understand than the conventional kind.