summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2019-11-28 14:31:38 +0100
committerTobias Klauser <tklauser@distanz.ch>2019-11-28 14:31:38 +0100
commitc4da332192bae16c1e8b469f64432c90c6124f38 (patch)
tree222b794b802318ec7c79b789af9947c43a334589
parent89e1fdbca570dc46763fc15624cab85c2175460e (diff)
.gitconfig: make 'git up' rebase on origin/master
-rw-r--r--.gitconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitconfig b/.gitconfig
index 9ab43a9..c48dc7a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -18,7 +18,7 @@
fixes = show --pretty=fixes -s
lp = log -p
dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | bzip2 -9v > ../$(git describe HEAD).tar.bz2"
- up = pull --rebase --autostash
+ up = pull --rebase --autostash origin master
cr = codereview
change = codereview change
gofmt = codereview gofmt