Erik Eckhardt erikeckhardt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [branch] | |
| autosetuprebase = always | |
| [alias] | |
| hist = log --color --graph --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue) %an %Creset %G?' --abbrev-commit | |
| hist2 = log --color --graph --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%ci)%C(bold blue) %an %Creset %G?' --abbrev-commit | |
| ref = log --walk-reflogs --format='%C(auto)%h %Cgreen%gd %C(yellow)%d%Creset %gs' --date=iso | |
| ref3 = log --walk-reflogs --date=iso --oneline | |
| ref2 = reflog --format='%C(auto)%h %Cgreen%gd %C(yellow)%d%Creset %gs' -g @{now} | |
| accept-ours = "!f() { git checkout --ours -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f" | |
| accept-theirs = "!f() { git checkout --theirs -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f" |