Created
July 13, 2018 10:49
-
-
Save pana-cc/089bc985b6e87f66dc2f90c7559aee8b to your computer and use it in GitHub Desktop.
C:\User\cankov\.gitconfig
This file contains 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
[user] | |
name = Panayot Cankov | |
email = panayot.cankov@progress.com | |
[mergetool "unity"] | |
cmd = 'C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe' merge --fallback none -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED" | |
[alias] | |
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 | |
l = !"git lg1" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
To merge Unity asset files (
.unity
,.prefab
, etc.):To pretty print git branches in terminal: