Skip to content

Instantly share code, notes, and snippets.

@the-ress
Last active February 17, 2024 21:16
Show Gist options
  • Save the-ress/111a455790fad9e90e90215731830e61 to your computer and use it in GitHub Desktop.
Save the-ress/111a455790fad9e90e90215731830e61 to your computer and use it in GitHub Desktop.
[push]
default = current
[credential]
helper = manager
[alias]
co = checkout
ci = commit
st = status
br = branch
type = 'cat-file
dump = 'cat-file
hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
[diff]
tool = tortoisediff
[difftool]
prompt = false
[merge]
tool = tortoisemerge
conflictstyle = diff3
[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"
[core]
autocrlf = false
safecrlf = false
editor = code --wait
[fetch]
prune = true
writeCommitGraph = true
[status]
showStash = true
[rerere]
enabled = true
[hub]
protocol = https
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment