Skip to content

Instantly share code, notes, and snippets.

@algonzalez
Last active July 9, 2021 18:49
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 algonzalez/510ee69e60bebe6b81515d2772a145c4 to your computer and use it in GitHub Desktop.
Save algonzalez/510ee69e60bebe6b81515d2772a145c4 to your computer and use it in GitHub Desktop.
[core]
editor = \"C:\\Users\\Alberto.Gonzalez\\tools\\VSCode\\Code.exe\" --wait
[diff]
tool = winmerge
[merge]
tool = winmerge
[difftool "diffmerge"]
cmd = $USERPROFILE/tools/DiffMerge/sgdm.exe \"$LOCAL\" \"$REMOTE\"
prompt = false
[difftool "vsdiffmerge"]
cmd = \"C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsDiffMerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
prompt = false
[difftool "winmerge"]
cmd = $USERPROFILE/tools/WinMerge/WinMergeU.exe -e -u -wl -dl \"$LOCAL\" -dr \"$REMOTE\" \"$LOCAL\" \"$REMOTE\"
prompt = false
[mergetool "diffmerge"]
cmd = cmd = $USERPROFILE/tools/DiffMerge/sgdm.exe -merge -result=\"$PWD/$MERGED\" \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\"
prompt = false
keepBackup = false
keepTemporaries = false
trustExitCode = true
[mergetool "vsdiffmerge"]
cmd = \"C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsDiffMerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
prompt = false
keepBackup = false
keepTemporaries = false
trustExitCode = true
[mergetool "winmerge"]
cmd = $USERPROFILE/tools/WinMerge/WinMergeU.exe -e -u -wl -dl $LOCAL -dr $REMOTE $LOCAL $REMOTE -o $MERGED
prompt = false
keepBackup = false
keepTemporaries = false
trustExitCode = true
[user]
name = Al Gonzalez
email = <emailAddress>
[alias]
alias = config --get-regexp ^alias\\.
edit-config = config --edit --global
br = branch
co = checkout
last = log -1 HEAD --stat
list-alias = config --get-regexp ^alias\\.
list-br = branch --list
list-branch = branch --list
l = log --name-status
lg = log --name-status --graph -decorate
ll = log --oneline
sb = show-branch --color=always --more=10 --no-name
sba = show-branch --color=always --all --more=10 --no-name
sbr = show-branch --color=always --remotes --more=10 --no-name
st = status --short --branch
tree = log --all --graph --decorate --oneline
[init]
defaultBranch = main
# see: https://medium.com/doing-things-right/platform-specific-gitconfigs-and-the-wonderful-includeif-7376cd44994d
[includeIf "gitdir:~/dev/"]
path = ~/.gitconfig-work
[includeIf "gitdir:/Users"]
path = ~/.gitconfig-macos
[includeIf "gitdir:C:"]
path = ~/.gitconfig-windows
[includeIf "gitdir:/home"]
path = ~/.gitconfig-linux
:: Show some quick details about the repository
@echo off
echo ## Remote URLs:
echo.
git remote --verbose
echo.
echo ## Remote Branches:
echo.
git branch --remotes
echo.
echo ## Local Branches:
echo.
git branch
echo.
echo ## Status:
echo.
git status --short
echo.
echo ## Most Recent Commits:
echo.
git log --max-count=2
echo.
echo Run 'git log' to list more commits,
echo or 'git show ^<commit id^>' for commit details
# Show some quick details about the repository
Write-Output "## Remote URLs:`n"
git remote --verbose
Write-Output "`n## Remote Branches:`n"
git branch --remotes
Write-Output "`n## Local Branches:`n"
git branch
Write-Output "`n## Status:`n"
git status --short
Write-Output "`n## Most Recent Commits:`n"
git log --max-count=2
Write-Output "`nRun 'git log' to list more commits,
or 'git show <commit id> for commit details"
<#
# gitTree
git config --global alias.tree "git log --all --graph --decorate --oneline"
git log --all --graph --decorate --oneline
#>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment