Skip to content

Commit

Permalink
Merge branch 'jk/diff-m-doc'
Browse files Browse the repository at this point in the history
* jk/diff-m-doc:
  docs: clarify meaning of -M for git-log
  • Loading branch information
Junio C Hamano committed Jun 13, 2010
2 parents c7f874e + 7ffad25 commit b0fd34e
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Documentation/diff-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down

0 comments on commit b0fd34e

Please sign in to comment.