summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-04-28 22:26:02 +0000
committerJunio C Hamano <junio@kernel.org>2011-04-28 22:26:02 +0000
commitb02377c2d2646d596e15bef1d0cc522023d26906 (patch)
treee841672b063a0bf7dc7f2d15e7751c0633a645be /diff-options.txt
parent209ebe834d6f29ff83e295db508f981713c9f0a7 (diff)
downloadgit-htmldocs-b02377c2d2646d596e15bef1d0cc522023d26906.tar.gz
Autogenerated HTML docs for v1.7.5-128-g50d30
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt17
1 files changed, 17 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt
index c93124be7..34f01458c 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -72,6 +72,10 @@ endif::git-format-patch[]
a cut-off percent (3% by default) are not shown. The cut-off percent
can be set with `--dirstat=<limit>`. Changes in a child directory are not
counted for the parent directory, unless `--cumulative` is used.
++
+Note that the `--dirstat` option computes the changes while ignoring
+the amount of pure code movements within a file. In other words,
+rearranging lines in a file is not counted as much as other changes.
--dirstat-by-file[=<limit>]::
Same as `--dirstat`, but counts changed files instead of lines.
@@ -259,6 +263,19 @@ endif::git-log[]
projects, so use it with caution. Giving more than one
`-C` option has the same effect.
+-D::
+--irreversible-delete::
+ Omit the preimage for deletes, i.e. print only the header but not
+ the diff between the preimage and `/dev/null`. The resulting patch
+ is not meant to be applied with `patch` nor `git apply`; this is
+ solely for people who want to just concentrate on reviewing the
+ text after the change. In addition, the output obviously lack
+ enough information to apply such a patch in reverse, even manually,
+ hence the name of the option.
++
+When used together with `-B`, omit also the preimage in the deletion part
+of a delete/create pair.
+
-l<num>::
The `-M` and `-C` options require O(n^2) processing time where n
is the number of potential rename/copy targets. This