Skip to content

Instantly share code, notes, and snippets.

@gwpl
Created May 22, 2016 16:44
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save gwpl/d4c7f4b3d5e92a211eb8e23eb051b507 to your computer and use it in GitHub Desktop.
Save gwpl/d4c7f4b3d5e92a211eb8e23eb051b507 to your computer and use it in GitHub Desktop.
[color]
branch = auto
diff = auto
interactive = auto
status = auto
grep = auto
[alias]
st = status
ci = commit
br = branch
co = checkout
a = add
d = diff
m = merge --no-ff
logol = log --pretty=oneline
noff = merge --no-ff
noffnc = merge --no-ff --no-commit
wdiff = diff --color-words
ciam = commit --amend
gn = grep -n
[user]
# name = FirstName SecondName
# email = U@S.com
[diff]
tool = meld
[merge "xyz_manual"]
name = xyz_manual
driver = ~/xyz_scripts/git_merge_driver_whole.sh %A %B %O
[difftool.latex]
cmd = git-latexdiff "$LOCAL" "$REMOTE"
[difftool]
prompt = false
[alias]
ldiff = difftool -t latex
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment