Skip to content

Commit

Permalink
Added initial files for Mac git development.
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffaco committed Mar 10, 2018
1 parent 73c118f commit bd506a0
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 0 deletions.
1 change: 1 addition & 0 deletions mac/bootstrap.sh
38 changes: 38 additions & 0 deletions mac/git/gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[am]
threeWay = true
[apply]
ignoreWhitespace = change
[color]
ui = true
[core]
editor = emacs -nw
excludesfile = ~/.gitignore
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[help]
autoCorrect = -1
[log]
abbrevCommit = true
decorate = short
date = local
[pull]
ff = only
[push]
default = current
[rerere]
enabled = true
autoUpdate = true
[user]
name = Jeff Coffler
email = [email protected]

[alias]
co-master = !git checkout master && git submodule foreach git checkout master
lol = log --oneline --graph
nuke = !git clean -fdx && git submodule foreach git clean -fdx
sub-status = !git submodule foreach git status
sync-subs = !git pull && git remote prune origin && git submodule foreach git pull && git submodule foreach git remote prune origin
rmrbranch = push origin --delete # <Branch-name> supplied by user
rmrprune = remote prune origin
12 changes: 12 additions & 0 deletions mac/git/gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Global GIT ignore file

# Editor backup files
*~

# Obvious Mac OS/X stuff
.DS_Store
.Trashes
.Spotlight-V100

# Ignore Python version files from pyenv
.python-version

0 comments on commit bd506a0

Please sign in to comment.