starred/Foundry
1
0
Fork 0
mirror of https://github.com/Misterio77/Foundry.git synced 2026-09-24 07:15:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

improve git aliases

Browse Source
This commit is contained in:
Gabriel Fontes
2023-12-31 19:23:40 -03:00
parent dc577ef282
commit ec4bd49836
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
home/misterio/features/cli/git.nix
+26 -23
View File
@@ -3,40 +3,43 @@ let
ssh = "${pkgs.openssh}/bin/ssh";
git-m7 = pkgs.writeShellScriptBin "git-m7" ''
repo="$(git remote -v | grep git@m7.rs | head -1 | cut -d ':' -f2 | cut -d ' ' -f1)"
# Add a .git suffix if it's missing
if [[ "$repo" != *".git" ]]; then
repo="$repo.git"
fi
if [ "$1" == "init" ]; then
if [ "$2" == "" ]; then
echo "You must specify a name for the repo"
exit 1
fi
${ssh} -A git@m7.rs << EOF
git init --bare "$2.git"
git -C "$2.git" branch -m main
case "''${1:-ls}" in
ls)
${ssh} -TA git@m7.rs ls | grep '\.git$'
;;
init)
name="''${2:-$(basename "$PWD")}"
${ssh} -TA git@m7.rs << EOF
git init --bare "$name.git"
git -C "$name.git" branch -m main
EOF
git remote add origin git@m7.rs:"$2.git"
elif [ "$1" == "ls" ]; then
${ssh} -A git@m7.rs ls
else
${ssh} -A git@m7.rs git -C "/srv/git/$repo" $@
fi
git remote add origin git@m7.rs:"$name.git"
;;
*)
repo="$(git remote -v | grep git@m7.rs | head -1 | cut -d ':' -f2 | cut -d ' ' -f1)"
if [[ "$repo" != *".git" ]]; then repo="$repo.git"; fi
${ssh} -TA git@m7.rs git -C "/srv/git/$repo" "$@"
;;
esac
'';
# git commit --amend, but for older commits
git-fixup = pkgs.writeShellScriptBin "git-fixup" ''
rev="$(git rev-parse "$1")"
git commit --fixup "$@"
GIT_SEQUENCE_EDITOR=true git rebase -i --autostash --autosquash $rev^
'';
in
{
home.packages = [ git-m7 ];
home.packages = [ git-m7 git-fixup ];
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
aliases = {
p = "pull --ff-only";
ff = "merge --ff-only";
pushall = "!git remote | xargs -L1 git push --all";
graph = "log --decorate --oneline --graph";
pushall = "!git remote | xargs -L1 git push --all";
add-nowhitespace = "!git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero -";
fast-forward = "merge --ff-only";
};
userName = "Gabriel Fontes";
userEmail = "hi@m7.rs";