binaryDiv
/
dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

gitconfig aliases: Rename undo to uncommit, add push-skip-ci

This commit is contained in:
Lexi / Zoe 2023-01-10 11:27:12 +01:00
parent 75dd586db5
commit 9f69638ed0
Signed by: binaryDiv
GPG Key ID: F8D4956E224DA232
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitconfig.inc/common.gitconfig
View File

@ -17,6 +17,7 @@
branch = false branch = false
config = false config = false
stash = false stash = false
tag = false
[status] [status]
submodulesummary = 1 submodulesummary = 1
@ -53,11 +54,14 @@
# Push a new branch to origin by setting the upstream branch # Push a new branch to origin by setting the upstream branch
push-new = "!f() { CURRENT=$(git branch --show-current); git push -u origin ${1-$CURRENT}; }; f" push-new = "!f() { CURRENT=$(git branch --show-current); git push -u origin ${1-$CURRENT}; }; f"
# Push with ci.skip option (probably only works with GitLab)
push-skip-ci = push -o ci.skip
# "back to the future": switch to default branch and pull # "back to the future": switch to default branch and pull
bttf = "!f() { DEFAULT=$(git default-branch); git switch ${1-$DEFAULT} && git pull --rebase --prune; }; f" bttf = "!f() { DEFAULT=$(git default-branch); git switch ${1-$DEFAULT} && git pull --rebase --prune; }; f"
# Reset HEAD to last commit, but keep files as they are # Reset HEAD to last commit, but keep files as they are
undo = reset HEAD~1 --mixed uncommit = reset HEAD~1 --mixed
# Stash changes, pull and pop stash again # Stash changes, pull and pop stash again
stash-pull = !git stash && git pull && git stash pop stash-pull = !git stash && git pull && git stash pop