diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:20 -0700 |
| commit | 209f0755934a0c9b448408f9b7c9849c15041ecc (patch) | |
| tree | ea04d9cd2847c3753c778b4dc5b976f37b19c910 /Documentation/git-blame.txt | |
| parent | Merge branch 'cc/test-oidmap' (diff) | |
| parent | t8014: remove unnecessary braces (diff) | |
| download | git-209f0755934a0c9b448408f9b7c9849c15041ecc.tar.gz git-209f0755934a0c9b448408f9b7c9849c15041ecc.zip | |
Merge branch 'br/blame-ignore'
"git blame" learned to "ignore" commits in the history, whose
effects (as well as their presence) get ignored.
* br/blame-ignore:
t8014: remove unnecessary braces
blame: drop some unused function parameters
blame: add a test to cover blame_coalesce()
blame: use the fingerprint heuristic to match ignored lines
blame: add a fingerprint heuristic to match ignored lines
blame: optionally track line fingerprints during fill_blame_origin()
blame: add config options for the output of ignored or unblamable lines
blame: add the ability to ignore commits and their changes
blame: use a helper function in blame_chunk()
Move oidset_parse_file() to oidset.c
fsck: rename and touch up init_skiplist()
Diffstat (limited to 'Documentation/git-blame.txt')
| -rw-r--r-- | Documentation/git-blame.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 16323eb80e..7e81541996 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -10,6 +10,7 @@ SYNOPSIS [verse] 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>] + [--ignore-rev <rev>] [--ignore-revs-file <file>] [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>] [--] <file> |