diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-28 21:11:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-28 21:11:47 (GMT) |
| commit | 50d3062ab2cea4e999b8f3bafd211ff348bca600 (patch) | |
| tree | 26cfdd46c59963b0301bd57d492a73f0abadbb5f /Documentation/diff-options.txt | |
| parent | 76a89d6d828486f96f42c69ef0cf87bb6b72fef5 (diff) | |
| parent | 467ddc14fe37ea6a3d77058fb24c4240e82e6344 (diff) | |
| download | git-50d3062ab2cea4e999b8f3bafd211ff348bca600.zip git-50d3062ab2cea4e999b8f3bafd211ff348bca600.tar.gz git-50d3062ab2cea4e999b8f3bafd211ff348bca600.tar.bz2 | |
Merge branch 'jc/diff-irreversible-delete'
* jc/diff-irreversible-delete:
git diff -D: omit the preimage of deletes
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 7e4bd42..34f0145 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -263,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 |