Skip to content

Commit b49b34d

Browse files
committed
git: rework stacked branch flow
1 parent e947437 commit b49b34d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

home/git.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
p = "pull --prune --all --autostash";
8282
pm = "!git fetch origin $(git main):$(git main) 2>/dev/null";
8383
stack = "!git log --decorate=short --pretty='format:%D' origin/$(git main).. | sed 's/, /\\n/g; s/HEAD -> //' | grep -Ev '^$'";
84-
puf = "!git log --decorate=short --pretty='format:%D' origin/$(git main).. | sed 's/, /\\n/g; s/HEAD -> //' | grep -Ev '^$' | xargs git push --force-with-lease --force-if-includes origin";
84+
puf = "!git log --decorate=short --pretty='format:%D' origin/$(git main).. | sed 's/, /\\n/g; s/HEAD -> //' | grep -Ev '^$' | xargs git push --set-upstream --force-with-lease --force-if-includes origin";
8585
rb = "!f() {
8686
if [ $# -eq 0 ]; then
8787
git fetch origin $(git main):$(git main)

0 commit comments

Comments
 (0)