mbakke pushed a commit to branch master
in repository guix.

commit f8b10932c86cf4c1657a67e8c484d76f757b64bd
Author: Sarah Morgensen <[email protected]>
AuthorDate: Mon Sep 20 16:37:44 2021 -0700

    Add git configuration templates to improve diff hunk header detection.
    
    This is a follow-up to commit 9fc8ae4171e5da4939a64fc6d684c8b9d85bbe84, 
which
    missed two hunks from <https://issues.guix.gnu.org/50363>.
    
    Reported by hackeryarn on #guix.
    
    * .gitattributes, etc/git/gitconfig: New files.
    
    Signed-off-by: Marius Bakke <[email protected]>
---
 .gitattributes    | 3 +++
 etc/git/gitconfig | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b31f7fd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+*.scm       diff=scheme
+*.scm.in    diff=scheme
+*.texi      diff=texinfo
diff --git a/etc/git/gitconfig b/etc/git/gitconfig
new file mode 100644
index 0000000..c9ebdc8
--- /dev/null
+++ b/etc/git/gitconfig
@@ -0,0 +1,5 @@
+[diff "scheme"]
+       xfuncname = "^(\\(define.*)$"
+
+[diff "texinfo"]
+       xfuncname = "^@node[[:space:]]+([^,]+).*$"

Reply via email to