diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2020-10-11 17:21:33 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2020-10-13 22:07:18 +0200 |
| commit | 210993e832bcee3542b3a3291497284b65b9ce17 (patch) | |
| tree | fa2f031923ff27f92771828c54e8364eb9fa77b7 | |
| parent | Merge pull request #7258 from mjstapp/zebra_remove_slsp (diff) | |
| download | frr-210993e832bcee3542b3a3291497284b65b9ce17.tar.xz frr-210993e832bcee3542b3a3291497284b65b9ce17.zip | |
*: Consolidate on first git blame ignore revs
The file .git-blame-ignore-revs was put first into
the system and is what was advertised in multiple
places. Since .ignore-revs was just created and
no announcement was made about the creation, let's
consolidate onto the first one created.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to '')
| -rw-r--r-- | .git-blame-ignore-revs | 11 | ||||
| -rw-r--r-- | .ignore-revs | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index e8a364050..61bc0ade6 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1 +1,12 @@ +# Following revs are all whitespace changes; use with +# git blame --ignore-revs-file .git-blame-ignore-revs <...> +# or to make it permanent +# git config blame.ignoreRevsFile .git-blame-ignore-revs +701a01920eee5431d2052aad92aefbdf50ac2139 +bf2394f08bdc91a6cbd3784a1bfa3af3247bb06f +0157c327715ca367d13b7f02b2981f3484ccdeeb +787e762445d50ca5b52fafcf8dd6de08ab90916f +ac2914d3261a78cf78eec7a6e20ebbe42bb57150 +ac4d0be5874fafd14212d6007fff7495edc9b152 d62a17aedeb0eebdba98238874bb13d62c48dbf9 +c14777c6bfd0a446c85243d3a9835054a259c276 diff --git a/.ignore-revs b/.ignore-revs deleted file mode 100644 index 3cf4ed9f5..000000000 --- a/.ignore-revs +++ /dev/null @@ -1,10 +0,0 @@ -# Following revs are all whitespace changes; use with -# git blame --ignore-revs-file .ignore-revs <...> -701a01920eee5431d2052aad92aefbdf50ac2139 -bf2394f08bdc91a6cbd3784a1bfa3af3247bb06f -0157c327715ca367d13b7f02b2981f3484ccdeeb -787e762445d50ca5b52fafcf8dd6de08ab90916f -ac2914d3261a78cf78eec7a6e20ebbe42bb57150 -ac4d0be5874fafd14212d6007fff7495edc9b152 -d62a17aedeb0eebdba98238874bb13d62c48dbf9 -c14777c6bfd0a446c85243d3a9835054a259c276 |