Skip to content

Commit

Permalink
more git customizations, including a better format
Browse files Browse the repository at this point in the history
  • Loading branch information
dlikhten committed Jun 17, 2014
1 parent 1287dd1 commit 70a7f35
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
diff = auto
interactive = auto
status = auto
ui = 1
[format]
pretty = oneline
pretty = fuller
[alias]
st = status
co = checkout
Expand All @@ -16,7 +17,8 @@
cim = commit -m
ciam = commit -am
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit
newcase = "!f() { git fetch dc-master && git checkout -b case/$1; }; f"
newcase = "!f() { git checkout resolved && git pull --rebase && git checkout -b case/$1; }; f"
logp = log -w -p --follow

[mergetool]
keepBackup = true
Expand All @@ -30,3 +32,5 @@
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[help]
autocorrect = 10

0 comments on commit 70a7f35

Please sign in to comment.