Skip to content

Instantly share code, notes, and snippets.

@talenguyen
Last active December 14, 2019 04:49
Show Gist options
  • Save talenguyen/22a1c1a2cf7accb4b176215916ddc7bb to your computer and use it in GitHub Desktop.
Save talenguyen/22a1c1a2cf7accb4b176215916ddc7bb to your computer and use it in GitHub Desktop.
Git config
# This is Git's per-user configuration file.
[user]
# Please adapt and uncomment the following lines:
#. name = Giang Nguyen
#. email = [email protected]
[alias]
co = checkout
st = status
unstage = reset HEAD --
pll = !git pull origin $(git branch-name)
branch-name = !git rev-parse --abbrev-ref HEAD
psh = !git push origin $(git branch-name)
ac = !git add -A && git commit
[core]
excludesfile = "$HOME/.gitignore_global"
# Android Studio as merge tool. Open Android Studio -> Tool -> Create Command-line Launcher.
[merge]
tool = studio
[mergetool "studio"]
cmd = studio "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
trustExitCode = false
[diff]
external = studio
[difftool "studio"]
cmd = opendiff "$LOCAL" "$REMOTE"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment