diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-16 17:30:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-16 17:30:18 -0800 |
| commit | 561197238ef95b126b5ff16780250d492ad24233 (patch) | |
| tree | f9f0d9ef6ad855b0bff945195e4dfaf70c4d8b42 /Documentation | |
| parent | 0346e324c2acdd763224cc071d6a6d0f55a982a1 (diff) | |
| parent | b9cb07726a7a288244b585939850348f319e5e0c (diff) | |
| download | git-561197238ef95b126b5ff16780250d492ad24233.tar.gz git-561197238ef95b126b5ff16780250d492ad24233.tar.xz | |
Merge branch 'maint'
* maint:
Fix uninitialized variable in get_refs_via_rsync().
Document git-blame triple -C option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/blame-options.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-blame.txt | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 1625ffce6..4833cac4b 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -98,8 +98,10 @@ commit. files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, - the command additionally looks for copies from all other - files in the parent for the commit that creates the file. + the command additionally looks for copies from other + files in the commit that creates the file. When this + option is given three times, the command additionally + looks for copies from other files in any commit. + <num> is optional but it is the lower bound on the number of alphanumeric characters that git must detect as moving diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 8c7b7b083..b786471dd 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m] - [-S <revs-file>] [-M] [-C] [-C] [--since=<date>] + [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>] [<rev> | --contents <file> | --reverse <rev>] [--] <file> DESCRIPTION |