From 5899ec0aab743fd422404c21ae045196ae01ec37 Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Sat, 9 Nov 2013 23:53:46 +0100 Subject: [PATCH 1/2] Move .gitconfig from copy to link --- {copy => link}/.gitconfig | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {copy => link}/.gitconfig (100%) diff --git a/copy/.gitconfig b/link/.gitconfig similarity index 100% rename from copy/.gitconfig rename to link/.gitconfig From 5adc896ffacec9ac73d23d1abfe3b02ef254a991 Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Sat, 9 Nov 2013 23:56:59 +0100 Subject: [PATCH 2/2] Move user.name and user.email to .gitconfig.local As of git 1.7.10+, it's possible to specify the following syntax in ~/.gitconfig: [include] path = /path/to/file This changeset moves the gitconfig from copy/ to link/ . The benefit of having gitconfig in link/ instead of copy/ is that updates to git aliases can be kept up to date by just running git pull on the dotfiles repo. --- copy/.gitconfig.local | 3 +++ link/.gitconfig | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 copy/.gitconfig.local diff --git a/copy/.gitconfig.local b/copy/.gitconfig.local new file mode 100644 index 0000000000..c77136f63b --- /dev/null +++ b/copy/.gitconfig.local @@ -0,0 +1,3 @@ +[user] + name = Ben Alman + email = EMAIL diff --git a/link/.gitconfig b/link/.gitconfig index b57b06c3f0..05874472e1 100644 --- a/link/.gitconfig +++ b/link/.gitconfig @@ -1,6 +1,5 @@ -[user] - name = Ben Alman - email = EMAIL +[include] + path = .gitconfig.local [core] autocrlf = input whitespace = fix,space-before-tab,tab-in-indent,trailing-space