ENH: Reworking old dotfiles to use dotbot
This commit is contained in:
commit
73c365eb1e
18 changed files with 698 additions and 0 deletions
61
git/gitconfig
Normal file
61
git/gitconfig
Normal file
|
@ -0,0 +1,61 @@
|
|||
[user]
|
||||
name = Matthew Dillon
|
||||
email = matthewrdillon@gmail.com
|
||||
[core]
|
||||
editor = vim
|
||||
excludesfile = /Users/matthew/.gitignore_global
|
||||
pager = diff-so-fancy | less --tabs=4 -RFX
|
||||
[color]
|
||||
diff = auto
|
||||
status = auto
|
||||
branch = auto
|
||||
interactive = auto
|
||||
ui = auto
|
||||
[gc]
|
||||
auto = 1
|
||||
[merge]
|
||||
summary=true
|
||||
tool = vimdiff
|
||||
conflictstyle = diff3
|
||||
prompt = false
|
||||
[alias]
|
||||
unstage = reset HEAD
|
||||
uncommit = reset --soft HEAD^
|
||||
# http://stackoverflow.com/a/9074343
|
||||
lg1 = log \
|
||||
--graph \
|
||||
--abbrev-commit \
|
||||
--decorate \
|
||||
--format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' \
|
||||
--all
|
||||
lg2 = log \
|
||||
--graph \
|
||||
--abbrev-commit \
|
||||
--decorate \
|
||||
--format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' \
|
||||
--all
|
||||
lg = !"git lg1"
|
||||
# https://gist.github.com/mwhite/6887990
|
||||
a = add
|
||||
ap = add -p
|
||||
c = commit --verbose
|
||||
ca = commit -a --verbose
|
||||
cm = commit -m
|
||||
cam = commit -a -m
|
||||
m = commit --amend --verbose
|
||||
d = diff
|
||||
ds = diff --stat
|
||||
dc = diff --cached
|
||||
s = status -s
|
||||
co = checkout
|
||||
cob = checkout -b
|
||||
# list branches sorted by last modified
|
||||
b = "!git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's-refs/heads/--'"
|
||||
# list aliases
|
||||
la = "!git config -l | grep alias | cut -c 7-"
|
||||
[push]
|
||||
default = upstream
|
||||
[credential]
|
||||
helper = osxkeychain
|
||||
[pull]
|
||||
rebase = true
|
3
git/gitignore_global
Normal file
3
git/gitignore_global
Normal file
|
@ -0,0 +1,3 @@
|
|||
*~
|
||||
.DS_Store
|
||||
.idea
|
Loading…
Add table
Add a link
Reference in a new issue