diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index f108ff8..2bdf690 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -18,6 +18,7 @@ alias.find-merge = "!sh -c 'commit=$0 && branch=\${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"; alias.show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"; }; + lfs.enable = true; }; fish = { shellAbbrs = {