lachtan/linux-workspace
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor git aliases

Browse Source
This commit is contained in:
Martin Blazik
2020-11-19 13:18:24 +01:00
parent 6631505148
commit 99245215ed
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/git-config.sh
View File

@@ -1,6 +1,12 @@
#!/bin/bash #!/bin/bash
if [[ $1 == "-dry" ]]; then set -u
ORIGIN=origin
UPSTREAM=$ORIGIN
MASTER=$UPSTREAM/master
if [[ $# > 0 && "$1" == "-dry" ]]; then
DRY=true DRY=true
else else
DRY=false DRY=false
@@ -43,10 +49,11 @@ git_alias puf $'!sh -c \'git push -f origin $(git branch --show-current)\''
git_alias rb rebase git_alias rb rebase
git_alias rbi "rebase -i --autosquash" git_alias rbi "rebase -i --autosquash"
git_alias rbim "rebase -i --autosquash $MASTER"
git_alias rba "rebase --abort" git_alias rba "rebase --abort"
git_alias rbc "rebase --continue" git_alias rbc "rebase --continue"
git_alias rbs "rebase --skip" git_alias rbs "rebase --skip"
git_alias rbom "rebase origin/master" git_alias rbm "rebase $MASTER"
git_alias unstage "reset HEAD --" git_alias unstage "reset HEAD --"
git_alias undo "reset --soft HEAD^" git_alias undo "reset --soft HEAD^"