From 51de88facb30593729efe01898e1403072207112 Mon Sep 17 00:00:00 2001 From: Adar Nimrod <nimrod@shore.co.il> Date: Wed, 27 Sep 2017 19:25:28 +0300 Subject: [PATCH] - Moved global gitignore to the expected location, remove explicit Git configuration. - Don't ignore all files, but set status.showUntrackedFiles to no, add to post-merge hook. --- .gitignore_global => .config/git/ignore | 0 .gitconfig | 2 -- .githooks/post-merge | 2 ++ .gitignore | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) rename .gitignore_global => .config/git/ignore (100%) delete mode 100644 .gitignore diff --git a/.gitignore_global b/.config/git/ignore similarity index 100% rename from .gitignore_global rename to .config/git/ignore diff --git a/.gitconfig b/.gitconfig index 4917d0a..926d462 100644 --- a/.gitconfig +++ b/.gitconfig @@ -29,8 +29,6 @@ update-requirements = !git stash save -a -u -q && ( git ls-files '*requirements*.txt' | xargs -n1 pur -r ) && ( git commit -a -m '- Updated requirements.' || echo 'No requirements updated.' ) && git stash pop [color] grep = true -[core] - excludesfile = ~/.gitignore_global [diff] tool = meld [difftool] diff --git a/.githooks/post-merge b/.githooks/post-merge index 97b5562..aaa4060 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -7,3 +7,5 @@ echo Generating SSH config Documents/bin/gen-ssh-config echo Loading dconf config Documents/bin/dconf-load +echo Configuring Git repo +git config --local status.showUntrackedFiles no diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 72e8ffc..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* -- GitLab