Merge pull request #422 from ragekit/development

Added git shell task.

Author: MartiUK

Diff for: config/ConEmu.xml

@@ -483,38 +483,48 @@
 			<value name="DndLKey" type="hex" data="00"/>
 			<value name="DndRKey" type="hex" data="a2"/>
 			<value name="WndDragKey" type="dword" data="00121101"/>
-				<key name="Tasks" modified="2015-01-21 23:28:29" build="140707">
+			<key name="Tasks" modified="2015-01-21 23:28:29" build="140707">
 				<value name="Count" type="dword" data="00000003"/>
-						<key name="Task1" modified="2015-01-21 23:28:29" build="140707">
+				<key name="Task1" modified="2015-01-21 23:28:29" build="140707">
 					<value name="Name" type="string" data="{cmd}"/>
 					<value name="GuiArgs" type="string" data="/icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
 					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console:d:%USERPROFILE%"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 				</key>
-						<key name="Task2" modified="2015-01-21 23:28:29" build="140707">
+				<key name="Task2" modified="2015-01-21 23:28:29" build="140707">
 					<value name="Name" type="string" data="{PowerShell}"/>
 					<value name="GuiArgs" type="string" data="/icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
 					<value name="Cmd1" type="string" data="PowerShell -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console:d:&quot;%USERPROFILE%&quot;"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 				</key>
-          <key name="Task3" modified="2015-01-21 23:28:29" build="140707">
-            <value name="Name" type="string" data="{PowerShell as Admin}"/>
-            <value name="Hotkey" type="dword" data="00000000"/>
-            <value name="GuiArgs" type="string" data="/icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
-            <value name="Cmd1" type="string" data="*PowerShell -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console:d:&quot;%USERPROFILE%&quot;"/>
-            <value name="Active" type="dword" data="00000000"/>
-            <value name="Count" type="dword" data="00000001"/>
-          </key>
-        </key>
-				<key name="Apps" modified="2015-01-21 23:28:29" build="140707">
+				<key name="Task3" modified="2015-01-21 23:28:29" build="140707">
+					<value name="Name" type="string" data="{PowerShell as Admin}"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
+					<value name="GuiArgs" type="string" data="/icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
+					<value name="Cmd1" type="string" data="*PowerShell -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console:d:&quot;%USERPROFILE%&quot;"/>
+					<value name="Active" type="dword" data="00000000"/>
+					<value name="Count" type="dword" data="00000001"/>
+				</key>
+				<key name="Task4" modified="2015-02-24 18:49:50" build="140707">
+					<value name="Name" type="string" data="{git sh}"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
+					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
+					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat &amp; %CMDER_ROOT%\vendor\msysgit\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd2" type="string" data="%CMDER_ROOT%\vendor\msysgit\git-bash.bat"/>
+					<value name="Active" type="dword" data="00000000"/>
+					<value name="Count" type="dword" data="00000001"/>
+				</key>
+			</key>
+
+			<key name="Apps" modified="2015-01-21 23:28:29" build="140707">
 				<value name="Count" type="dword" data="00000000"/>
 			</key>
 			<key name="Colors" modified="2015-01-21 23:28:29" build="140707">
-			<key name="Palette1" modified="2015-01-21 23:28:29" build="140707">
+				<key name="Palette1" modified="2015-01-21 23:28:29" build="140707">
 					<value name="Name" type="string" data="Monokai"/>
 					<value name="ExtendColors" type="hex" data="00"/>
 					<value name="ExtendColorIdx" type="hex" data="0e"/>