Skip to content

Instantly share code, notes, and snippets.

@pana-cc
Created July 13, 2018 10:49
Show Gist options
  • Save pana-cc/089bc985b6e87f66dc2f90c7559aee8b to your computer and use it in GitHub Desktop.
Save pana-cc/089bc985b6e87f66dc2f90c7559aee8b to your computer and use it in GitHub Desktop.
C:\User\cankov\.gitconfig
[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"
@pana-cc
Copy link
Author

pana-cc commented Jul 13, 2018

To merge Unity asset files (.unity, .prefab, etc.):

git mergetool --tool=unity Assets\Scenes\MyScene.unity

To pretty print git branches in terminal:

git l

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment