geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

git-sync: Use proper thing

Browse source
This commit is contained in:
Geoffrey Frogeye 2024-10-06 22:02:00 +02:00
parent a7e2b49bea
commit 9389d1d284
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hm/git/default.nix
View file

@ -19,10 +19,10 @@ in
cd "${r.path}" cd "${r.path}"
if [ -d .jj ] if [ -d .jj ]
then then
jj git fetch ${lib.getExe pkgs.jujutsu} git fetch
jj rebase -d main@origin ${lib.getExe pkgs.jujutsu} rebase -d main@origin
jj branch set main -r @- ${lib.getExe pkgs.jujutsu} branch set main -r @-
jj git push ${lib.getExe pkgs.jujutsu} git push
else else
${pkgs.git}/bin/git --no-optional-locks diff --quiet || echo "Repository is dirty!" ${pkgs.git}/bin/git --no-optional-locks diff --quiet || echo "Repository is dirty!"
${pkgs.git}/bin/git pull || true ${pkgs.git}/bin/git pull || true