From 0efa2e4c3002fb93646448e19205abadfecf7573 Mon Sep 17 00:00:00 2001 From: Adar Nimrod <nimrod@shore.co.il> Date: Thu, 23 Nov 2017 08:54:55 +0200 Subject: [PATCH] - Use current path for git fixup and squash aliases. --- .gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index a92b3b8..53eb0d0 100644 --- a/.gitconfig +++ b/.gitconfig @@ -9,7 +9,7 @@ empty-commit = commit --allow-empty exec = "!exec " ff = merge --no-edit --ff-only master - fixup = !git commit --fixup $(git last-commit) + fixup = !cd "${GIT_PREFIX:-}" && git commit --fixup $(git last-commit) forget = reset HEAD^ merg = merge --no-edit posh = push --set-upstream origin HEAD @@ -20,7 +20,7 @@ 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 SimpleHTTPServer - squash = !git commit --squash $(git last-commit) + squash = !cd "${GIT_PREFIX:-}" && git commit --squash $(git last-commit) staash = stash --all stat = status --short --branch tag-version = !git tag --annotate --force --message "v$(cat VERSION)" "v$(cat VERSION)" -- GitLab