Skip to content

Instantly share code, notes, and snippets.

@astur astur/.gitconfig
Created Feb 2, 2018

Embed
What would you like to do?
tools in git config
#sublime
core.editor=subl -n -w
#diffmerge
diff.tool=diffmerge
difftool.diffmerge.cmd=diffmerge "$LOCAL" "$REMOTE"
merge.tool=diffmerge
mergetool.diffmerge.cmd=diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"
mergetool.diffmerge.trustexitcode=true
#vscode
core.editor = code --wait
merge.tool = vscode
mergetool.vscode.cmd = code --wait $MERGED
diff.tool = vscode
difftool.vscode.cmd = code --wait --diff $LOCAL $REMOTE
#from shell:
#git config --global core.editor code --wait
#git config --global merge.tool vscode
#git config --global mergetool.vscode.cmd "code --wait $MERGED"
#git config --global diff.tool vscode
#git config --global difftool.vscode.cmd "code --wait --diff $LOCAL $REMOTE"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.