From 74ce57947d1cd9df40c0a3b914f164764e40e545 Mon Sep 17 00:00:00 2001
From: "Eric D. Rohler" <erohler@progress.com>
Date: Mon, 30 Mar 2020 19:55:13 -0400
Subject: [PATCH] update conemu and alias

---
 user-ConEmu.xml  |  2 +-
 user_aliases.cmd | 29 ++++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/user-ConEmu.xml b/user-ConEmu.xml
index 8cdb57e..5b2d2a0 100644
--- a/user-ConEmu.xml
+++ b/user-ConEmu.xml
@@ -67,7 +67,7 @@
 			<value name="SetDefaultTerminalStartup" type="hex" data="01"/>
 			<value name="DefaultTerminalNoInjects" type="hex" data="00"/>
 			<value name="DefaultTerminalConfirm" type="hex" data="01"/>
-			<value name="DefaultTerminalApps" type="string" data="explorer.exe|devenv.exe|code.exe|powershell.exe|cmd.exe|bash.exe|wsl.exe"/>
+			<value name="DefaultTerminalApps" type="string" data="explorer.exe|devenv.exe|powershell.exe|cmd.exe|bash.exe|wsl.exe"/>
 			<value name="ProcessAnsi" type="hex" data="01"/>
 			<value name="UseClink" type="hex" data="01"/>
 			<value name="StartType" type="hex" data="02"/>
diff --git a/user_aliases.cmd b/user_aliases.cmd
index 3c46506..b01fe4c 100644
--- a/user_aliases.cmd
+++ b/user_aliases.cmd
@@ -3,9 +3,9 @@
 ;= %SystemRoot%\system32\doskey /listsize=1000 /macrofile=%0%
 ;= rem In batch mode, jump to the end of the file
 ;= goto:eof
-;= Add aliases below here
+
+;= rem general
 e.=explorer .
-gl=git log --oneline --all --graph --decorate  $*
 ls=ls --show-control-chars -F --color $*
 pwd=cd
 clear=cls
@@ -46,4 +46,27 @@ docs-rprt-srvr=cd /d "D:\dev\repos\docs\report-server-docs"
 msa=cd /d "d:\dev\repos\sources\msaliases"
 pb=cd /d "d:\dev\repos\sources\ericrohler_static"
 fed=cd /d "D:\dev\repos\sources\fiddler\Fiddler\WebUi" && code Fiddler.code-workspace && cd /d "D:\dev\repos\sources\fiddler\Fiddler\WebUi\Fiddler.WebUi" && dotnet run bin/Release/netcoreapp3.1/Fiddler.WebUi.dll -c Release
-tdd=cd /d "d:\dev\repos\sources\team-dashboard"
\ No newline at end of file
+tdd=cd /d "d:\dev\repos\sources\team-dashboard"
+
+;= rem git shortcuts
+gs=git status
+ga=git add
+gaa=git add -A
+gc=git commit --message $*
+gca=git commit --all --message $*
+gcam=git commit --amend --message $*
+gcamne=git commit --amend --no-edit
+gb=git branch
+gbd=git branch -d $*
+gco=git checkout $*
+gcob=git checkout -b $*
+gl=git log
+gladog=git log --graph --oneline --all --decorate
+gd=git diff
+gds=git diff --staged
+gdt=git difftool
+gdts=git difftool --staged
+gps=git push
+gpl=git pull
+gf=git fetch
+gfp=git fetch --prune
\ No newline at end of file