From f827c0ea984c44f8dc5a4eac65b58532f765dce7 Mon Sep 17 00:00:00 2001
From: Miquel Sabaté <msabate@suse.com>
Date: Mon, 13 Jul 2015 12:00:41 +0200
Subject: git: removed the `fork` alias, since it's provided by the `scripts`
 repo

The `fork` alias has been exppanded into a full-blown bash script that does
more clever things with the given input. It has been moved into my `scripts`
repo, so it's automatically installed by the `install.sh` script.
---
 gitconfig | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index e5ebf14..8cc57d6 100644
--- a/gitconfig
+++ b/gitconfig
@@ -13,7 +13,6 @@
 [alias]
   a = commit -a
   down = pull --rebase --stat
-  fork = !git fetch upstream && git merge upstream/$1
   vader = push --force
 
 [push]
-- 
cgit v1.2.3