aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
authorMiquel Sabaté <msabate@suse.com>2015-07-13 12:00:41 +0200
committerMiquel Sabaté <msabate@suse.com>2015-07-13 12:00:41 +0200
commitf827c0ea984c44f8dc5a4eac65b58532f765dce7 (patch)
tree089eeb9532801311d0cb2e8b8e854d0bba61d97b /gitconfig
parent46679e3e59f3084e98fa0a1d055a58308cda5b59 (diff)
downloaddotfiles-f827c0ea984c44f8dc5a4eac65b58532f765dce7.tar.gz
dotfiles-f827c0ea984c44f8dc5a4eac65b58532f765dce7.zip
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.
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig1
1 files changed, 0 insertions, 1 deletions
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]