From a8e0728352303ed9a9b8be2b08c11a29265318c3 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 19 May 2019 16:00:14 +0300
Subject: [PATCH] Some more git shortcut aliases.
---
.config/git/config | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.config/git/config b/.config/git/config
index 2d54b43..ea26155 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -19,6 +19,8 @@
Pull = pull --progress --ff --tags
pull-force = !git fetch && git reset --hard "$(git tracking)"
pushes = !git remote | xargs -n1 git push
+ remaster = !git fetch --all && git autorebase origin/master
+ rerebase = !git autorebase "$(git tracking)"
root = rev-parse --show-toplevel
serve-git = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
serve-http = !git update-server-info && cd .git && python -m http.server 8080
@@ -28,6 +30,7 @@
staaash = stash push --all --include-untracked
stat = status --short --branch
tag-version = !git tag --annotate --force --message "v$(cat VERSION)" "v$(cat VERSION)"
+ temptree = !git worktree add "$(mktemp -d)"
tracking = rev-parse --abbrev-ref --symbolic-full-name @{upstream}
trigger = !git commit --allow-empty --no-edit --amend && git pushes --force-with-lease
[color]
--
GitLab