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].
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.
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
---
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.
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'::
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.