Skip to content

Instantly share code, notes, and snippets.

@rajinder-yadav
Last active July 28, 2021 05:13
Show Gist options
  • Save rajinder-yadav/77fb586ccb85e06d39591724f606bdbc to your computer and use it in GitHub Desktop.
Save rajinder-yadav/77fb586ccb85e06d39591724f606bdbc to your computer and use it in GitHub Desktop.
Git configuration
[user]
name = Dev Guy
email = [email protected]
[core]
editor = vim
excludesfile = /Users/yadav/.gitignore_global
[color]
ui = auto
diff = auto
status = auto
branch = auto
[alias]
a = add -u
aa = add -A .
c = commit -m
cc = commit -a -m
ca = commit --amend
cl = clone
b = branch
ba = branch -a -v
bm = checkout master
bd = checkout dev
bc = checkout
bcc = checkout -b
brm = branch -D
d = difftool
dc = diff --cached
fd = fetch origin dev
fm = fetch origin master
f = fetch -p origin
fp = fetch --all -p
m = merge
p = pull --rebase
po = push origin
pb = push -u origin
pd = push origin dev
pm = push origin master
l = log --pretty=oneline
ll = log
re = remote -v
r = rebase
ri = rebase -i
rm = rebase origin/master
rd = rebase origin/dev
rhh = reset HEAD --hard
s = status
ss = status -s
spush = stash push
spop = stash pop
sls = stash list
undo = checkout --
unstage = reset HEAD
uncommit = reset --soft HEAD~1
[merge]
tool = kdiff3
[diff]
tool = vimdiff
[difftool]
prompt = false
[mergetool "kdiff3"]
path = /usr/bin/kdiff3
keepBackup = false
trustExitCode = false
[difftool "kdiff3"]
path = /usr/bin/kdiff3
keepBackup = false
trustExitCode = false
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[commit]
template = /Users/yadav/.stCommitMsg
[init]
defaultBranch = main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment