diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 11:22:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 11:22:27 -0700 |
| commit | b0fd34ecd5a386b7b09a0161413c50f957ac181e (patch) | |
| tree | 77b7aa3fc94f1d95fc0a32bd52fa12ada135b1d8 /Documentation/diff-options.txt | |
| parent | c7f874e405a52f93d486094034d886fc140961c9 (diff) | |
| parent | 7ffad2501489690edd9335fdd1e69c05699767e3 (diff) | |
| download | git-b0fd34ecd5a386b7b09a0161413c50f957ac181e.tar.gz | |
Merge branch 'jk/diff-m-doc'
* jk/diff-m-doc:
docs: clarify meaning of -M for git-log
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 0d89aaaf2a..e745a3ccdc 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -210,7 +210,14 @@ endif::git-format-patch[] Break complete rewrite changes into pairs of delete and create. -M:: +ifndef::git-log[] Detect renames. +endif::git-log[] +ifdef::git-log[] + If generating diffs, detect and report renames for each commit. + For following files across renames while traversing history, see + `--follow`. +endif::git-log[] -C:: Detect copies as well as renames. See also `--find-copies-harder`. |