From adaa068956b895b0fe73f325e8ffec2f0afa8c0a Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Wed, 5 Oct 2022 14:58:49 +0200 Subject: [PATCH] git: gerrit aliases rewor --- .gitconfig | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitconfig b/.gitconfig index f15b90c..614f5bd 100644 --- a/.gitconfig +++ b/.gitconfig @@ -35,10 +35,10 @@ sync = branchless sync bco = branchless checkout c = branchless checkout -gerrit-push = !git push origin HEAD:refs/for/$(git rev-parse --abbrev-ref HEAD) -gerrit-push-wip = !git push origin HEAD:refs/for/$(git rev-parse --abbrev-ref HEAD)%wip -gerrit-push-ready = !git push origin HEAD:refs/for/$(git rev-parse --abbrev-ref HEAD)%ready -gerrit-replace = !git commit --amend -a && git gerrit-push +gerrit-push = !git push origin HEAD:refs/for/main +gerrit-push-wip = !git push origin HEAD:refs/for/main%wip +gerrit-push-ready = !git push origin HEAD:refs/for/main%ready +gerrit-replace = !git commit --amend -a && git push origin HEAD:refs/for/main gerrit-config = !git fetch origin refs/meta/config:refs/remotes/origin/meta/config && git checkout origin/meta/config gerrit-config-push = !git push origin HEAD:refs/meta/config gp = gerrit-push @@ -115,3 +115,9 @@ concurrenttransfers = 32 [difftool "difft"] cmd = difft --display inline "$LOCAL" "$REMOTE" +[scalar] + repo = /tmp/k2/src +[maintenance] + repo = /tmp/k2/src +[fetch] + showForcedUpdates = true