13 home.packages = lib.mkIf config.programs.git.enable [
17 pkgs-unstable-latest.gh
33 enable = lib.mkDefault true;
39 package = lib.mkDefault pkgs.gitMinimal;
43 ai = "add --intent-to-add";
48 authors = "shortlog -s -n";
50 bl = "git log -p -M --follow --stat --";
52 ca = "commit --amend";
53 caa = "commit --amend -C@";
54 caaa = "commit --amend -C@ -a";
55 cf = "commit --fixup";
59 dcw = "diff --cached --word-diff=color";
60 dh = "diff --histogram";
61 dp = "diff --patience";
62 dt = "difftool --patience";
63 dtc = "difftool --cached";
64 dw = "diff --word-diff=color";
66 ign = "ls-files -o -i --exclude-standard";
68 ll = "log --graph --decorate --pretty=oneline --abbrev-commit";
69 lp = "log -p --pretty=fuller --stat";
70 lpg = "log -p --pretty=fuller --stat -g";
73 patch = "push rad HEAD:refs/patches";
74 # See https://stackoverflow.com/a/65839129/6741004
75 pf = "push -v --force-with-lease --force-if-includes";
78 repack-1 = "git repack -a -d -f --depth=1 --window=1";
79 repack-250 = "git repack -a -d -f --depth=250 --window=250";
84 spull = "!git-svn fetch && git-svn rebase";
85 spush = "!git-svn dcommit";
88 stu = "status -unormal";
90 fetch-local = "!git fetch local && git tag -d $(git describe --exact-match 2>/dev/null >/dev/null) && git fetch --tags local";
91 pull-local = "!git fetch-local && git checkout -B master local/master";
92 pull-local-old = "!git fetch-local && git checkout HEAD'^' && git branch -f master local/master && git checkout master";
93 root = ''!git rev-list --parents HEAD | egrep "^[a-f0-9]{40}$"'';
94 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]\\(\\^{}\\)\\?\"'';
95 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"'';
96 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]\\(\\^{}\\)\\?\"'';
97 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"'';
98 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"'';
99 cl = "notes --ref=changelog append";
100 cl-bug = "notes --ref=changelogs/bugs append";
101 cl-feature = "notes --ref=changelogs/features append";
102 wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
104 branch.sort = "-committerdate";
105 color.branch = "auto";
107 #color.diff.whitespace = "red reverse";
108 color.status = "auto";
110 commit.verbose = true;
112 #core.untrackedCache true
113 core.commentChar = "auto";
114 core.quotepath = "false";
115 core.whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol";
116 diff.algorithm = "histogram";
117 diff.colorMoved = "plain";
118 diff.mnemonicPrefix = true;
120 diff.sqldiff.command = "sqldiff";
122 fetch.pruneTags = true;
124 format.pretty = "oneline";
125 gui.fontdiff = ''-family "DejaVu Sans Mono" -size 8 -weight normal -slant roman -underline 0 -overstrike 0'';
126 gui.fontui = ''-family "DejaVu Sans" -size 8 -weight normal -slant roman -underline 0 -overstrike 0'';
127 gui.spellingdictionary = "en_US";
129 guitool."Rebase interactive" = {
130 cmd = "EDITOR=gvim git rebase -i $REVISION";
133 help.autocorrect = "prompt";
134 init.defaultBranch = "main";
135 log.diffMerges = "remerge";
136 merge.tool = "vimdiff";
137 merge.conflictStyle = "zdiff3";
138 protocol.version = 2;
140 push.autoSetupRemote = true;
141 push.default = "simple";
142 push.followTags = true;
143 push.useForceIfIncludes = true;
144 rebase.autoSquash = true;
145 rebase.autoStash = true;
146 rebase.updateRefs = true;
147 rerere.autoupdate = true;
148 rerere.enabled = true;
149 sendemail.chainReplyTo = "false";
150 sendemail.composeencoding = "UTF-8";
151 sendemail.confirm = "always";
152 sendemail.envelopeSender = "auto";
153 sendemail.multiedit = "yes";
154 sendemail.suppressFrom = "false";
155 sendemail.suppresscc = "self";
156 sendemail.thread = "true";
157 sendemail.validate = "true";
158 tag.sort = "version:refname";
159 web.browser = "elinks";
163 diff.external = lib.concatStringsSep " " [
164 "${pkgs.difftastic}/bin/difft"
167 "--display side-by-side"
172 diff.tool = "difftastic";
173 difftool.prompt = false;
174 difftool.difftastic.cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
175 pager.difftool = true;
180 core.pager = "delta --grep-separator-symbol keep";
181 interactive.diffFilter = "delta --color-only --features=interactive";
182 delta.features = "decorations";
183 delta.interactive = {
184 keep-plus-minus-markers = false;
186 delta.decorations = {
187 commit-decoration-style = "blue ol";
188 commit-style = "raw";
190 hunk-header-decoration-style = "blue box";
191 hunk-header-file-style = "red";
192 hunk-header-line-number-style = "#067a00";
193 hunk-header-style = "file line-number syntax";
198 programs.bash = lib.mkIf config.programs.git.enable {
201 ge = "git-edit-commit";
203 gge = "git-grep-edit";
208 git-edit-commit () { $EDITOR $(git diff-tree --no-commit-id --name-only -r "$@"); }
210 xargs --null "$EDITOR" -- <<EOF
211 $(git grep --name-only --recursive --null "$@")
214 git-grep-edit () { $EDITOR $(git grep --name-only --recursive "$@"); }