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