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