8 home.packages = lib.mkIf config.programs.git.enable [
26 enable = lib.mkDefault true;
31 package = lib.mkDefault pkgs.gitMinimal;
38 authors = "shortlog -s -n";
40 bl = "git log -p -M --follow --stat --";
42 ca = "commit --amend";
43 caa = "commit --amend -C@";
44 caaa = "commit --amend -C@ -a";
45 cf = "commit --fixup";
49 dcw = "diff --cached --word-diff=color";
50 dh = "diff --histogram";
51 dp = "diff --patience";
52 dt = "difftool --patience";
53 dtc = "difftool --cached";
54 dw = "diff --word-diff=color";
56 ign = "ls-files -o -i --exclude-standard";
58 ll = "log --graph --decorate --pretty=oneline --abbrev-commit";
59 lp = "log -p --pretty=fuller --stat";
60 lpg = "log -p --pretty=fuller --stat -g";
63 patch = "push rad HEAD:refs/patches";
64 # See https://stackoverflow.com/a/65839129/6741004
65 pf = "push -v --force-with-lease --force-if-includes";
68 repack-1 = "git repack -a -d -f --depth=1 --window=1";
69 repack-250 = "git repack -a -d -f --depth=250 --window=250";
74 spull = "!git-svn fetch && git-svn rebase";
75 spush = "!git-svn dcommit";
78 stu = "status -unormal";
80 fetch-local = "!git fetch local && git tag -d $(git describe --exact-match 2>/dev/null >/dev/null) && git fetch --tags local";
81 pull-local = "!git fetch-local && git checkout -B master local/master";
82 pull-local-old = "!git fetch-local && git checkout HEAD'^' && git branch -f master local/master && git checkout master";
83 root = ''!git rev-list --parents HEAD | egrep "^[a-f0-9]{40}$"'';
84 has-tag-version = ''!git show-ref --tags -d | grep -qx \"^$(git rev-parse HEAD) refs/tags/v[0-9][0-9][0-9][0-9]\\.[0-9][0-9]\\.[0-9][0-9]\\(\\^{}\\)\\?\"'';
85 tag-version = ''"!git has-tag-version && return; v=$(TZ=UTC date +v%Y-%m-%d) && name=$(git rev-parse --show-toplevel | sed -e 's:^.*/work::') && set -x && git tag -s -m \"$name $v\" $v"'';
86 has-tag-majordate = ''!git show-ref --tags -d | grep -qx \"^$(git rev-parse HEAD) refs/tags/v[0-9]\\+.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\\(\\^{}\\)\\?\"'';
87 tag-majordate = ''"!git has-tag-majordate && return; name=$(basename $(dirname $(git rev-parse --show-toplevel))); major=$(basename $(git rev-parse --show-toplevel)); version=''${version:-$(TZ=UTC date +\"v$major.%Y%m%d\")} && set -x && git tag -s -m \"$name $version\" $version"'';
88 tag-cabal = ''"!set -x; for cabal in $(git ls-files | grep '.*\\.cabal$'); do name=$(sed -ne 's/^name: *\\(.*\\)/\\1/p' \"$cabal\"); version=$(sed -ne 's/^version: *\\(.*\\)/\\1/p' \"$cabal\"); git tag --merged | grep -Fqx \"$name-$version\" || git tag -f -s -m \"$name v$version\" $name-$version; done"'';
89 cl = "notes --ref=changelog append";
90 cl-bug = "notes --ref=changelogs/bugs append";
91 cl-feature = "notes --ref=changelogs/features append";
92 wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
95 browser.elinks.cmd = "elinks";
96 color.branch = "auto";
98 #color.diff.whitespace = "red reverse";
99 color.status = "auto";
100 core.commentChar = "auto";
101 core.quotepath = "false";
102 core.whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol";
103 diff.algorithm = "histogram";
104 diff.sqldiff.command = "sqldiff";
105 format.pretty = "oneline";
106 gui.fontdiff = ''-family "DejaVu Sans Mono" -size 8 -weight normal -slant roman -underline 0 -overstrike 0'';
107 gui.fontui = ''-family "DejaVu Sans" -size 8 -weight normal -slant roman -underline 0 -overstrike 0'';
108 gui.spellingdictionary = "en_US";
110 guitool."Rebase interactive" = {
111 cmd = "EDITOR=gvim git rebase -i $REVISION";
114 init.defaultBranch = "main";
115 merge.tool = "vimdiff";
116 merge.conflictStyle = "zdiff3";
117 protocol.version = 2;
119 push.default = "simple";
120 push.useForceIfIncludes = true;
121 rebase.autosquash = "true";
122 sendemail.chainReplyTo = "false";
123 sendemail.composeencoding = "UTF-8";
124 sendemail.confirm = "always";
125 sendemail.envelopeSender = "auto";
126 sendemail.multiedit = "yes";
127 sendemail.suppressFrom = "false";
128 sendemail.suppresscc = "self";
129 sendemail.thread = "true";
130 sendemail.validate = "true";
131 web.browser = "elinks";
135 diff.external = lib.concatStringsSep " " [
136 "${pkgs.difftastic}/bin/difft"
139 "--display side-by-side"
144 diff.tool = "difftastic";
145 difftool.prompt = false;
146 difftool.difftastic.cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
147 pager.difftool = true;
152 core.pager = "delta --grep-separator-symbol keep";
153 interactive.diffFilter = "delta --color-only --features=interactive";
154 delta.features = "decorations";
155 delta.interactive = {
156 keep-plus-minus-markers = false;
158 delta.decorations = {
159 commit-decoration-style = "blue ol";
160 commit-style = "raw";
162 hunk-header-decoration-style = "blue box";
163 hunk-header-file-style = "red";
164 hunk-header-line-number-style = "#067a00";
165 hunk-header-style = "file line-number syntax";
170 programs.bash = lib.mkIf config.programs.git.enable {
173 ge = "git-edit-commit";
175 gge = "git-grep-edit";
179 git-edit-commit () { $EDITOR $(git diff-tree --no-commit-id --name-only -r "$@"); }
180 git-grep-edit () { $EDITOR $(git grep --name-only --recursive "$@"); }