You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2020/12/18 12:11:04 UTC

[lucene-solr] 02/02: LUCENE-9570: add parial reformatting commit reference to .git-blame-ignore-revs [thanks rmuir] and add a note to git.txt aiding in making this a persistent local option.

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit a827aaac2bc1cc86bf182592203ea8fc749d3318
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Fri Dec 18 13:10:47 2020 +0100

    LUCENE-9570: add parial reformatting commit reference to .git-blame-ignore-revs [thanks rmuir] and add a note to git.txt aiding in making this a persistent local option.
---
 .git-blame-ignore-revs |  2 ++
 help/git.txt           | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000..ad6485a
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# LUCENE-9570 [google java formatter applied]
+6faa4f98e04
diff --git a/help/git.txt b/help/git.txt
index 3c6f63a..b17fffe 100644
--- a/help/git.txt
+++ b/help/git.txt
@@ -1,3 +1,6 @@
+git
+===
+
 A list of resources that may be helpful for those learning git:
 
  - Dawid's task-oriented help:
@@ -12,3 +15,13 @@ A list of resources that may be helpful for those learning git:
 
  - git workflows, their pros and cons:
    https://help.github.com/articles/what-is-a-good-git-workflow/
+
+
+git blame
+=========
+
+Git blame shows the last revision that touched a line in a given file. Certain
+reformatting commits may stand in the way here. Please issue the following
+command so that git ignores those irrelevant commits:
+
+git config blame.ignoreRevsFile .git-blame-ignore-revs