Skip to content

Instantly share code, notes, and snippets.

@andre-f-paggi
Last active April 20, 2018 15:42
Show Gist options
  • Save andre-f-paggi/796f755596797282d147659f609a6ca5 to your computer and use it in GitHub Desktop.
Save andre-f-paggi/796f755596797282d147659f609a6ca5 to your computer and use it in GitHub Desktop.
Mine .gitconfig file
[user]
name = André Franciscato Paggi
email = andre.franciscato@hotmail.com
[diff]
tool = tortoisediff
[difftool]
prompt = false
[merge]
tool = tortoisemerge
[mergetool]
prompt = false
keepBackup = false
[difftool "tortoisediff"]
cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -mine "$REMOTE" -base "$LOCAL"
[mergetool "tortoisemerge"]
cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -base "$BASE" -theirs "$REMOTE" -mine "$LOCAL" -merged "$MERGED"
[alias]
find = log --pretty=\"format:%Cgreen%H %Cblue%s\" --name-status --grep
cmp = "!f() { git add -A && git commit -m \"$@\" && git push; }; f"
l1 = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=format:'%Y-%m-%d %H:%M:%S'
l2 = log --graph --oneline --decorate --all
l3 = !git log --oneline | grep
l4 = log -p -1
l5 = "!f() { \
git log --after=\"$(date -j -v-$1d +%Y-%m-%d)\" --oneline; \
}; f"
[core]
autocrlf = false
eol = lf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment