summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2018-05-25 19:56:05 (EDT)
committer P. J. McDermott <pj@pehjota.net>2018-05-25 19:56:05 (EDT)
commit281b22fb20a1f07b265676fcdfbd6d1bf86bbe28 (patch)
tree9393c95a3e03014c7a73637333e6544feb1b1c74
parentf5176dcefbc7737e9cc39dc1d148cfab8a57f70d (diff)
downloadclaws-mail-281b22fb20a1f07b265676fcdfbd6d1bf86bbe28.zip
claws-mail-281b22fb20a1f07b265676fcdfbd6d1bf86bbe28.tar.gz
claws-mail-281b22fb20a1f07b265676fcdfbd6d1bf86bbe28.tar.bz2
Sort .claws-mail/menurc in diff
-rw-r--r--.gitattributes.d/claws-mail2
-rw-r--r--.gitconfig.d/claws-mail2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitattributes.d/claws-mail b/.gitattributes.d/claws-mail
index f7348d7..bbc8428 100644
--- a/.gitattributes.d/claws-mail
+++ b/.gitattributes.d/claws-mail
@@ -1,3 +1,3 @@
/.claws-mail/accountrc* filter=accountrc
/.claws-mail/clawsrc* filter=clawsrc
-/.claws-mail/menurc* filter=menurc
+/.claws-mail/menurc* filter=menurc diff=gtkaccelmap
diff --git a/.gitconfig.d/claws-mail b/.gitconfig.d/claws-mail
index 90a00ed..c13813e 100644
--- a/.gitconfig.d/claws-mail
+++ b/.gitconfig.d/claws-mail
@@ -7,3 +7,5 @@
[filter "menurc"]
clean = "awk 'NR <=3 {print $0; next;} {print $0 | \"sort\";}'"
smudge = cat
+[diff "gtkaccelmap"]
+ textconv = "awk 'NR <=3 {print $0; next;} {print $0 | \"sort\";}'"