Commit ea67f2ea authored by nimrod's avatar nimrod
Browse files

- 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.
parent 9c8a1522

.gitignore_global→.config/git/ignore

+0 −0

File moved.

View file

.gitconfig

+0 −2
Original line number Diff line number Diff line
@@ -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]

.githooks/post-merge

+2 −0
Original line number Diff line number Diff line
@@ -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

.gitignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
*