bin/git: fix little script issues

This commit is contained in:
xeruf 2021-12-02 23:28:11 +01:00
parent 32aa4a4e7f
commit 150324c3ac
2 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
git rev-parse @{upstream} >/dev/null 2>&1 || git rev-parse @{upstream} >/dev/null 2>&1 ||
git branch --set-upstream-to=@{push} git branch --set-upstream-to=@{push}
git pull --rebase --autostash "$@" 2> >(head -3 >&2) || git pull --rebase --autostash "$@" 2> >(head -3 >&2) ||

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# Remove the given files from the last commit # Remove the given files from the last commit
#git diff -p HEAD~ -- "$@" | git apply --reverse --cached # https://stackoverflow.com/a/70197343
git reset HEAD~ "$@" git reset HEAD~ "$@"
git commit --amend git commit -v --amend