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