From 209b54e15b95c9d3e1112dd0e6c659a1ecd88568 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Tue, 22 Nov 2022 13:02:56 +0200 Subject: [PATCH] Moved git config to .config/git --- README.md | 2 +- gitconfig => config/git/config | 4 +--- gitignore_global => config/git/gitignore | 0 install.sh | 5 +++-- 4 files changed, 5 insertions(+), 6 deletions(-) rename gitconfig => config/git/config (95%) rename gitignore_global => config/git/gitignore (100%) diff --git a/README.md b/README.md index be5b3a2..612f707 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## Other stuff -Update `Brewfile`` +Update `Brewfile` ```bash brew bundle dump --force --file=~/.dotfiles/Brewfile diff --git a/gitconfig b/config/git/config similarity index 95% rename from gitconfig rename to config/git/config index 8718227..e1edd4f 100644 --- a/gitconfig +++ b/config/git/config @@ -2,9 +2,7 @@ name = Ismo Vuorinen email = ismo.vuorinen@vincit.fi [core] - excludesfile = ~/.gitignore_global -[commit] - template = ~/.stCommitMsg + excludesfile = ~/.config/git/gitignore [alias] reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d diff --git a/gitignore_global b/config/git/gitignore similarity index 100% rename from gitignore_global rename to config/git/gitignore diff --git a/install.sh b/install.sh index 83b4796..40e6688 100644 --- a/install.sh +++ b/install.sh @@ -69,8 +69,9 @@ handle_file_ln "/Users/ivuorinen/.dotfiles/bash_profile" "/Users/ivuorinen/.bash handle_file_ln "/Users/ivuorinen/.dotfiles/bashrc" "/Users/ivuorinen/.bashrc" handle_file_ln "/Users/ivuorinen/.dotfiles/config/antigen.zsh" "/Users/ivuorinen/.config/antigen.zsh" handle_file_ln "/Users/ivuorinen/.dotfiles/config/gh/config.yml" "/Users/ivuorinen/.config/gh/config.yml" -handle_file_ln "/Users/ivuorinen/.dotfiles/gitconfig" "/Users/ivuorinen/.gitconfig" -handle_file_ln "/Users/ivuorinen/.dotfiles/gitignore_global" "/Users/ivuorinen/.gitignore_global" +handle_file_ln "/Users/ivuorinen/.dotfiles/config/git/config" "/Users/ivuorinen/.config/git/config" +handle_file_ln "/Users/ivuorinen/.dotfiles/config/git/gitignore" "/Users/ivuorinen/.config/git/gitignore" +handle_file_ln "/Users/ivuorinen/.dotfiles/git_profiles" "/Users/ivuorinen/.git_profiles" handle_file_ln "/Users/ivuorinen/.dotfiles/huskyrc" "/Users/ivuorinen/.huskyrc" handle_file_ln "/Users/ivuorinen/.dotfiles/install.sh" "/Users/ivuorinen/.install.sh" handle_file_ln "/Users/ivuorinen/.dotfiles/local/bin/x-open-ports" "/Users/ivuorinen/.local/bin/x-open-ports"