aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/gitconfig b/gitconfig
index 418340e..cf4ae0d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -11,8 +11,9 @@
autocorrect = 1
[alias]
- down = pull --rebase --stat
a = commit -a
+ down = pull --rebase --stat
+ fork = !git fetch upstream && git merge upstream/$1
[push]
default = matching
@@ -37,3 +38,5 @@
insteadOf = kde:
[url "ssh://git@git.kde.org/"]
pushInsteadOf = kde:
+[url "git@git.kde.org:"]
+ pushInsteadOf = kde: