Merge pull request #1070 from janschulz/unicode_path_prompt

Parse the original prompt for cwd and env names
⬆️ Update Git to v2.9.2
2025-07-17 04:59:09 +08:00 · 2016-08-15 16:40:35 +02:00 · 2016-08-14 04:59:27 +02:00 · 2016-08-09 13:45:36 +02:00 · 2016-07-30 00:36:32 +02:00 · 2016-07-18 01:47:45 +02:00
54 changed files with 1703 additions and 251 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,7 @@ Thumbs.db
 build/
 Version v*
 *.bak
+config/user-*
+config/aliases
+config/profile.d
+.github_changelog_generator
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,640 @@
+# Change Log
+
+## [v1.3.0](https://github.com/cmderdev/cmder/tree/v1.3.0) (2016-07-14)
+[Full Changelog](https://github.com/cmderdev/cmder/compare/v1.3.0-pre...v1.3.0)
+
+**Closed issues:**
+
+- Cmder getting raped by dr.web quarantine system [\#1031](https://github.com/cmderdev/cmder/issues/1031)
+- Can I switch vim in cmder to gvim installed by myself? [\#1021](https://github.com/cmderdev/cmder/issues/1021)
+- \[Windows10 Bash\] Could use UP/Down/Home/End....key in cmder [\#1017](https://github.com/cmderdev/cmder/issues/1017)
+- {lamb} problem again... :-\( [\#1012](https://github.com/cmderdev/cmder/issues/1012)
+- High-lighting text and copying is broken [\#1008](https://github.com/cmderdev/cmder/issues/1008)
+- issue with updating ConEmuPack.160619.7z [\#1006](https://github.com/cmderdev/cmder/issues/1006)
+- after updating cmder [\#1004](https://github.com/cmderdev/cmder/issues/1004)
+- using touch in cli doesn't work anymore with latest update [\#1002](https://github.com/cmderdev/cmder/issues/1002)
+- v1.3.0-pre doesn't support running inside program files folder [\#998](https://github.com/cmderdev/cmder/issues/998)
+- Text cursor disappears when window resized [\#997](https://github.com/cmderdev/cmder/issues/997)
+- how to use clip command in the cmder?  [\#996](https://github.com/cmderdev/cmder/issues/996)
+- {git}{hg} appearing in path print out rather than the values they represent [\#995](https://github.com/cmderdev/cmder/issues/995)
+- Don't just prepend the git path. [\#994](https://github.com/cmderdev/cmder/issues/994)
+- Attempt to concatenate local 'package\_version' \(a nil value\) [\#991](https://github.com/cmderdev/cmder/issues/991)
+- After auto-update git/hg indication and lambda in prompt are broken [\#990](https://github.com/cmderdev/cmder/issues/990)
+- Lack of Proxy Setting [\#989](https://github.com/cmderdev/cmder/issues/989)
+- Clink completion failing [\#987](https://github.com/cmderdev/cmder/issues/987)
+- \ [\#986](https://github.com/cmderdev/cmder/issues/986)
+- Is It Possible to recover the files removed by `rm -rf`  [\#979](https://github.com/cmderdev/cmder/issues/979)
+- . [\#973](https://github.com/cmderdev/cmder/issues/973)
+- right click context menu open cmd without color [\#972](https://github.com/cmderdev/cmder/issues/972)
+- git branch name is not red when there are pending changes [\#967](https://github.com/cmderdev/cmder/issues/967)
+- git checkout autocomplete is showing files [\#966](https://github.com/cmderdev/cmder/issues/966)
+- Cmder proxy Ubuntu Bash on Windows [\#964](https://github.com/cmderdev/cmder/issues/964)
+- Update version on Chocolatey [\#959](https://github.com/cmderdev/cmder/issues/959)
+- ConEmu Injecting hooks fail [\#958](https://github.com/cmderdev/cmder/issues/958)
+- cmder \(from cmder\_mini.zip\) crashes on startup on windows 7 pro x64 [\#955](https://github.com/cmderdev/cmder/issues/955)
+- Feature: add some extra prompt-tuning hooks to profile.ps1 from user-profile.ps1 [\#950](https://github.com/cmderdev/cmder/issues/950)
+- Provide alternate icon colors [\#947](https://github.com/cmderdev/cmder/issues/947)
+- "\cmder\config\settings was unexpected at this time" and {lamb} is shown instead of lambda symbol [\#937](https://github.com/cmderdev/cmder/issues/937)
+- Cannot save settings [\#936](https://github.com/cmderdev/cmder/issues/936)
+- init.bat fails and shows {lamb} and {git} [\#935](https://github.com/cmderdev/cmder/issues/935)
+- Cmder minimizing when losing focus. [\#934](https://github.com/cmderdev/cmder/issues/934)
+- init.bat always uses "npm" as window title [\#933](https://github.com/cmderdev/cmder/issues/933)
+- `ls` return vertical list instead of horizontal? [\#924](https://github.com/cmderdev/cmder/issues/924)
+- Arrow keys do not work with bash \(Win10/Linux Subsystem\) [\#914](https://github.com/cmderdev/cmder/issues/914)
+- Aliased commands: Syntax Highlighting Lost [\#912](https://github.com/cmderdev/cmder/issues/912)
+- 'vim' hangs when loading in cmder bash session [\#910](https://github.com/cmderdev/cmder/issues/910)
+- Unix commands not working in windows 10 [\#908](https://github.com/cmderdev/cmder/issues/908)
+- git 2.8 ? [\#905](https://github.com/cmderdev/cmder/issues/905)
+- Confusing "Settings" \> "Integration" dialog behavior [\#904](https://github.com/cmderdev/cmder/issues/904)
+- v1.3.0 antivirus [\#903](https://github.com/cmderdev/cmder/issues/903)
+- Feature Request: Send to all/group [\#896](https://github.com/cmderdev/cmder/issues/896)
+- Updating git-for-windows after installing the full cmder? [\#887](https://github.com/cmderdev/cmder/issues/887)
+- Enconding ? [\#877](https://github.com/cmderdev/cmder/issues/877)
+- the {cmd} task [\#876](https://github.com/cmderdev/cmder/issues/876)
+- Failed to start cmder, app crashed [\#871](https://github.com/cmderdev/cmder/issues/871)
+- Having trouble with packaged conemu install, how can I point to a different one? [\#858](https://github.com/cmderdev/cmder/issues/858)
+- path entry for \<git\>/cmd instead of \<git\>/bin?  [\#853](https://github.com/cmderdev/cmder/issues/853)
+- Cmder lists path on window resize. [\#851](https://github.com/cmderdev/cmder/issues/851)
+- cmder and vim compatibility problem [\#846](https://github.com/cmderdev/cmder/issues/846)
+- Unable to git pull,push or any action [\#845](https://github.com/cmderdev/cmder/issues/845)
+- Missing git support, install posth-git [\#834](https://github.com/cmderdev/cmder/issues/834)
+- "-ExecutionPolicy' is not recognized as an internal or external command" [\#830](https://github.com/cmderdev/cmder/issues/830)
+- How to upgrade from v1.1.4.1 to v1.2 ? [\#825](https://github.com/cmderdev/cmder/issues/825)
+- Startup warning [\#821](https://github.com/cmderdev/cmder/issues/821)
+- Cmder prompt screwed up with latest Windows 10 Build [\#820](https://github.com/cmderdev/cmder/issues/820)
+- Installer for cmder? [\#812](https://github.com/cmderdev/cmder/issues/812)
+- Netcat is missing [\#810](https://github.com/cmderdev/cmder/issues/810)
+- Cmder - Warning: Missing git support  [\#806](https://github.com/cmderdev/cmder/issues/806)
+- Branch name not visible and vagrant commands not working [\#778](https://github.com/cmderdev/cmder/issues/778)
+- Run command to start [\#775](https://github.com/cmderdev/cmder/issues/775)
+- Security Warning - cmder\vendor\profile.ps1 [\#767](https://github.com/cmderdev/cmder/issues/767)
+- v1.2.9中文路径乱码 [\#764](https://github.com/cmderdev/cmder/issues/764)
+- How do confirm exe's are safe? md5? checksum? [\#761](https://github.com/cmderdev/cmder/issues/761)
+- Prevent other apps from overwriting the prompt? [\#749](https://github.com/cmderdev/cmder/issues/749)
+- Sublime Integration fails - Can't find "C:\Programs"? [\#727](https://github.com/cmderdev/cmder/issues/727)
+- Use tab to cycle through auto complete, like the original cmd does? [\#681](https://github.com/cmderdev/cmder/issues/681)
+- Emoji support [\#642](https://github.com/cmderdev/cmder/issues/642)
+- Strange Vim behaviour after Git for Windows upgrade [\#628](https://github.com/cmderdev/cmder/issues/628)
+- Invoking ConEmu instead of ConEmu64 on Windows 10 64-bit [\#574](https://github.com/cmderdev/cmder/issues/574)
+- Using .bashrc [\#565](https://github.com/cmderdev/cmder/issues/565)
+- Git checks for 'commits' every time a folder is changed? [\#529](https://github.com/cmderdev/cmder/issues/529)
+- Powershell tab title issue [\#528](https://github.com/cmderdev/cmder/issues/528)
+- storage in userprofile \(instead of fixed config dir relative to the executable\) [\#526](https://github.com/cmderdev/cmder/issues/526)
+- ncurses borders incorrectly displayed with ssh.exe [\#499](https://github.com/cmderdev/cmder/issues/499)
+- git-p4.py \[Errno 2\] No such file or directory [\#392](https://github.com/cmderdev/cmder/issues/392)
+- ConEmu auto attach with Cmder aliases [\#388](https://github.com/cmderdev/cmder/issues/388)
+- Using the context menu doesn't open a new tab in Single Instance Mode [\#356](https://github.com/cmderdev/cmder/issues/356)
+- Integrate PSReadLine [\#301](https://github.com/cmderdev/cmder/issues/301)
+- Moved Documents folder, running "ls" gives "ls: My Documents: No such file or directory" [\#284](https://github.com/cmderdev/cmder/issues/284)
+- bug when using up and down key [\#264](https://github.com/cmderdev/cmder/issues/264)
+- ps scripts: support space in foldernames [\#261](https://github.com/cmderdev/cmder/issues/261)
+- Accented characters [\#234](https://github.com/cmderdev/cmder/issues/234)
+- color scheme lost after CTRL+C on git status [\#227](https://github.com/cmderdev/cmder/issues/227)
+- CJK problem [\#222](https://github.com/cmderdev/cmder/issues/222)
+- Launcher opens new window separately [\#217](https://github.com/cmderdev/cmder/issues/217)
+- Theme not applied on Run command prompt here [\#216](https://github.com/cmderdev/cmder/issues/216)
+- "Your alias cannot contain a space" [\#214](https://github.com/cmderdev/cmder/issues/214)
+- Blank line [\#205](https://github.com/cmderdev/cmder/issues/205)
+- Open cmder as Tab from the file explorer [\#197](https://github.com/cmderdev/cmder/issues/197)
+- Git Not working [\#192](https://github.com/cmderdev/cmder/issues/192)
+- Add hotkey to switch tabs [\#186](https://github.com/cmderdev/cmder/issues/186)
+- Child shells yields broken prompt [\#178](https://github.com/cmderdev/cmder/issues/178)
+- generation of Pipe symbol not possible [\#168](https://github.com/cmderdev/cmder/issues/168)
+- Moving files with ../ [\#158](https://github.com/cmderdev/cmder/issues/158)
+- attach to GUI was requested, but there is no console processes! [\#150](https://github.com/cmderdev/cmder/issues/150)
+- Create windows installer [\#142](https://github.com/cmderdev/cmder/issues/142)
+
+**Merged pull requests:**
+
+- Development [\#1037](https://github.com/cmderdev/cmder/pull/1037) ([Stanzilla](https://github.com/Stanzilla))
+- Minor update in README.md [\#1016](https://github.com/cmderdev/cmder/pull/1016) ([Mansuro](https://github.com/Mansuro))
+- Added rainbow icons [\#1014](https://github.com/cmderdev/cmder/pull/1014) ([JoshuaKGoldberg](https://github.com/JoshuaKGoldberg))
+- Fix git branch colouring [\#1011](https://github.com/cmderdev/cmder/pull/1011) ([MoFo88](https://github.com/MoFo88))
+- Bump clink-completions to 0.3.1 [\#992](https://github.com/cmderdev/cmder/pull/992) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Fix git branch name never shown as dirty [\#974](https://github.com/cmderdev/cmder/pull/974) ([janschulz](https://github.com/janschulz))
+- Register cmder in the context menu from powershell [\#962](https://github.com/cmderdev/cmder/pull/962) ([Jackbennett](https://github.com/Jackbennett))
+- cmd: change the prompt in lua [\#961](https://github.com/cmderdev/cmder/pull/961) ([janschulz](https://github.com/janschulz))
+- Update clink-completions to 0.3.0 [\#946](https://github.com/cmderdev/cmder/pull/946) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Added :verbose-output subroutine, made aliases update more functional [\#945](https://github.com/cmderdev/cmder/pull/945) ([daxgames](https://github.com/daxgames))
+- fixed git not working in cmder cmd session and added some comments [\#943](https://github.com/cmderdev/cmder/pull/943) ([daxgames](https://github.com/daxgames))
+- More variable quoting in init.bat [\#941](https://github.com/cmderdev/cmder/pull/941) ([janschulz](https://github.com/janschulz))
+- Add quotes around all variables [\#940](https://github.com/cmderdev/cmder/pull/940) ([janschulz](https://github.com/janschulz))
+- Fix missing "\" when building dirpath to psmodules [\#916](https://github.com/cmderdev/cmder/pull/916) ([liftir](https://github.com/liftir))
+- upgraded git to 2.8.1 [\#911](https://github.com/cmderdev/cmder/pull/911) ([daxgames](https://github.com/daxgames))
+- Added proxy support [\#909](https://github.com/cmderdev/cmder/pull/909) ([daxgames](https://github.com/daxgames))
+- fixed - not running user-aliases.cmd if aliases variable is overridde… [\#892](https://github.com/cmderdev/cmder/pull/892) ([daxgames](https://github.com/daxgames))
+- better git path handling [\#865](https://github.com/cmderdev/cmder/pull/865) ([janschulz](https://github.com/janschulz))
+- Enhanced alias.bat to allow file storage path [\#862](https://github.com/cmderdev/cmder/pull/862) ([daxgames](https://github.com/daxgames))
+
+## [v1.3.0-pre](https://github.com/cmderdev/cmder/tree/v1.3.0-pre) (2016-03-20)
+[Full Changelog](https://github.com/cmderdev/cmder/compare/v1.2.9...v1.3.0-pre)
+
+**Implemented enhancements:**
+
+- Change appveyor.yml to publish all resulting artifacts from builds. [\#717](https://github.com/cmderdev/cmder/issues/717)
+- Stuff that should not be in the release zips [\#662](https://github.com/cmderdev/cmder/issues/662)
+- v1.2.0: Errors because of PowerShell execution policy [\#483](https://github.com/cmderdev/cmder/issues/483)
+- Alias without it's opposit [\#281](https://github.com/cmderdev/cmder/issues/281)
+- Improve new UX [\#230](https://github.com/cmderdev/cmder/issues/230)
+- Different Font for the Lambda [\#211](https://github.com/cmderdev/cmder/issues/211)
+- Git Credential Cache [\#184](https://github.com/cmderdev/cmder/issues/184)
+- Crawling for executables in /bin [\#61](https://github.com/cmderdev/cmder/issues/61)
+- Include Scoop as package manager [\#42](https://github.com/cmderdev/cmder/issues/42)
+- Complete aliases on tab [\#38](https://github.com/cmderdev/cmder/issues/38)
+- Path ordering issue - wrong find.exe executes by default [\#37](https://github.com/cmderdev/cmder/issues/37)
+- Msys bash [\#702](https://github.com/cmderdev/cmder/pull/702) ([daxgames](https://github.com/daxgames))
+- Added code to check for the existence of a customized ini file.. [\#427](https://github.com/cmderdev/cmder/pull/427) ([kodybrown](https://github.com/kodybrown))
+- New build and pack scripts [\#152](https://github.com/cmderdev/cmder/pull/152) ([bliker](https://github.com/bliker))
+- Ability to change Font Size using Ctrl+MouseWheel [\#125](https://github.com/cmderdev/cmder/pull/125) ([saaguero](https://github.com/saaguero))
+
+**Fixed bugs:**
+
+- Aliases with environment variables not working [\#684](https://github.com/cmderdev/cmder/issues/684)
+- msysgit is not injected into path. [\#493](https://github.com/cmderdev/cmder/issues/493)
+- cmder display error [\#491](https://github.com/cmderdev/cmder/issues/491)
+- Path issues on startup [\#487](https://github.com/cmderdev/cmder/issues/487)
+- Missing DLL: MSVCP140.dll [\#482](https://github.com/cmderdev/cmder/issues/482)
+- Single mode does not set current directory [\#420](https://github.com/cmderdev/cmder/issues/420)
+- Fails to parse path in PATH system variable with '&' [\#185](https://github.com/cmderdev/cmder/issues/185)
+- Cmder hangs after idling for a few minutes or when clicking above the cursor [\#109](https://github.com/cmderdev/cmder/issues/109)
+- No color scheme in tabs opened as Administrator [\#94](https://github.com/cmderdev/cmder/issues/94)
+- Bug in alias.bat [\#52](https://github.com/cmderdev/cmder/issues/52)
+- Clicking/selecting text on terminal causes slowdown [\#40](https://github.com/cmderdev/cmder/issues/40)
+
+**Closed issues:**
+
+- Tab autocompetion for git is inconsistent \(doesn't work with git add\) [\#885](https://github.com/cmderdev/cmder/issues/885)
+- Line-wrapping breaks when using backspace key in a git repo with Cmder mini and Git for Windows. [\#883](https://github.com/cmderdev/cmder/issues/883)
+- Cmder opens off screen  [\#881](https://github.com/cmderdev/cmder/issues/881)
+- ctrl+l with powershell in quake mode clears the first prompt line as well [\#879](https://github.com/cmderdev/cmder/issues/879)
+- Cmder Windows Pinning Issue \[weird\] [\#869](https://github.com/cmderdev/cmder/issues/869)
+- Why not use @ECHO OFF? [\#868](https://github.com/cmderdev/cmder/issues/868)
+- alias with && doesn't work [\#859](https://github.com/cmderdev/cmder/issues/859)
+- Alias with multi-word git commit message not working [\#847](https://github.com/cmderdev/cmder/issues/847)
+- switch to use master a the default development branch [\#836](https://github.com/cmderdev/cmder/issues/836)
+- Git branch information is broken for submodules [\#833](https://github.com/cmderdev/cmder/issues/833)
+- Cmder does not open in last open window position [\#816](https://github.com/cmderdev/cmder/issues/816)
+- CMDer won't open Sublime [\#814](https://github.com/cmderdev/cmder/issues/814)
+- integrating Git for Windows vs. Git for Windows SDK? [\#813](https://github.com/cmderdev/cmder/issues/813)
+- When will the next version be available? [\#811](https://github.com/cmderdev/cmder/issues/811)
+- how to use /? to get the help doc in the `cmder` [\#808](https://github.com/cmderdev/cmder/issues/808)
+- \[Enhancement\] Powershell and Babun \(cygwin + zsh\) [\#807](https://github.com/cmderdev/cmder/issues/807)
+- iul [\#800](https://github.com/cmderdev/cmder/issues/800)
+- Update clink settings [\#793](https://github.com/cmderdev/cmder/issues/793)
+- how to add the environment variable to the cmder? [\#792](https://github.com/cmderdev/cmder/issues/792)
+- % variable expansion in config/alias [\#791](https://github.com/cmderdev/cmder/issues/791)
+- Problems with node [\#790](https://github.com/cmderdev/cmder/issues/790)
+- Resizing adds new lines [\#789](https://github.com/cmderdev/cmder/issues/789)
+- How to remove "Cmder Here" in the context menu after .\cmder.exe /REGISTER ALL? [\#787](https://github.com/cmderdev/cmder/issues/787)
+- \[v1.2.9\] Can not alias with env. variables. [\#784](https://github.com/cmderdev/cmder/issues/784)
+- How should i add a context menu entry? [\#780](https://github.com/cmderdev/cmder/issues/780)
+- CMDER\_START should always be set to USERPROFILE unless explicitly set through /START parameter [\#772](https://github.com/cmderdev/cmder/issues/772)
+- Startup Error: cmder\vendor\profile.ps1 cannot be loaded. [\#769](https://github.com/cmderdev/cmder/issues/769)
+- How to make Cmder stop displaying warning? [\#768](https://github.com/cmderdev/cmder/issues/768)
+- Unable to install cmder using Install-Package in Windows 10 [\#762](https://github.com/cmderdev/cmder/issues/762)
+- Option to disable preview stacking with multiple tabs [\#758](https://github.com/cmderdev/cmder/issues/758)
+- I can't run de Cmder.exe [\#755](https://github.com/cmderdev/cmder/issues/755)
+- Multiple location references when maximizing [\#753](https://github.com/cmderdev/cmder/issues/753)
+- CLink completions for npm increase cmder startup time for one second [\#750](https://github.com/cmderdev/cmder/issues/750)
+- cmder.exe infected with Variant.Kazy.767238 [\#748](https://github.com/cmderdev/cmder/issues/748)
+- cmder.exe considered harmful by Bitdefender [\#744](https://github.com/cmderdev/cmder/issues/744)
+- curl ntlm auth stopped working [\#741](https://github.com/cmderdev/cmder/issues/741)
+- Cmder and gulp, not friend? [\#725](https://github.com/cmderdev/cmder/issues/725)
+- Antivirus deleting some files in cmder \(reporting them as infected\) [\#724](https://github.com/cmderdev/cmder/issues/724)
+- Windows Defender on Windows 10 finds Trojan in extracted files [\#713](https://github.com/cmderdev/cmder/issues/713)
+- e. shortcut not working ? [\#712](https://github.com/cmderdev/cmder/issues/712)
+- "Cmder here" doesn't work if set start-up dir [\#709](https://github.com/cmderdev/cmder/issues/709)
+- Is cmder support scrolling with touch screen? [\#706](https://github.com/cmderdev/cmder/issues/706)
+- npm\_prompt.lua:11: attempt to concatenate local 'package\_version' \(a nil value\) [\#700](https://github.com/cmderdev/cmder/issues/700)
+- Cmder \(cmd.exe\) startup crashes at clink step [\#699](https://github.com/cmderdev/cmder/issues/699)
+- Doesn't run cmder.exe [\#696](https://github.com/cmderdev/cmder/issues/696)
+- Not getting git status in 1.2.9 prompt [\#692](https://github.com/cmderdev/cmder/issues/692)
+- Tab-Complete paths not working \[1.2.9\] [\#691](https://github.com/cmderdev/cmder/issues/691)
+- The directory be duplicate displayed [\#689](https://github.com/cmderdev/cmder/issues/689)
+- Don't work at my windows 7 \(misiing api-ms-win-crt-runtime-l1-1-0.dll\) [\#682](https://github.com/cmderdev/cmder/issues/682)
+- git: 'pull' is not a git command. See 'git --help'. [\#679](https://github.com/cmderdev/cmder/issues/679)
+- Error in NPM-Prompt [\#678](https://github.com/cmderdev/cmder/issues/678)
+- msysgit commands not working [\#675](https://github.com/cmderdev/cmder/issues/675)
+- Restore last session with history on start [\#672](https://github.com/cmderdev/cmder/issues/672)
+- Restart As Admin bug [\#669](https://github.com/cmderdev/cmder/issues/669)
+- git for windows 2.6.1 ssh folder [\#661](https://github.com/cmderdev/cmder/issues/661)
+- der [\#660](https://github.com/cmderdev/cmder/issues/660)
+- Cannot clean the terminal [\#659](https://github.com/cmderdev/cmder/issues/659)
+- Cmder do not run if username has spaces between [\#658](https://github.com/cmderdev/cmder/issues/658)
+- When exiting vim, cursor goes to first line of terminal instead of the end of it [\#656](https://github.com/cmderdev/cmder/issues/656)
+- Cmder suddenly start crashing on startup [\#650](https://github.com/cmderdev/cmder/issues/650)
+- Cannot switch to mapped network drive [\#649](https://github.com/cmderdev/cmder/issues/649)
+- Ctrl + D? [\#648](https://github.com/cmderdev/cmder/issues/648)
+- Is there any hotkey jump to "Search" box? [\#647](https://github.com/cmderdev/cmder/issues/647)
+- File /vendor/conemu-maximus5/ConEmu.exe not found. [\#646](https://github.com/cmderdev/cmder/issues/646)
+- As admin CMDER\_ROOT not set in Powershell  [\#643](https://github.com/cmderdev/cmder/issues/643)
+- Having ls, cat, etc [\#641](https://github.com/cmderdev/cmder/issues/641)
+- Cmder having Permission Errors for Windows 10 [\#640](https://github.com/cmderdev/cmder/issues/640)
+- Powershell - Msys Aliases [\#639](https://github.com/cmderdev/cmder/issues/639)
+- Problem with install on window 7? [\#637](https://github.com/cmderdev/cmder/issues/637)
+- Invoke-Expression : The term 'Invoke-Expression' is not recognized [\#636](https://github.com/cmderdev/cmder/issues/636)
+- it doesn't like Docker [\#631](https://github.com/cmderdev/cmder/issues/631)
+- Latest release : Windows 7 : Windows cannot find ".../vendor/conemu-maximus5/CpmE,u.exe" [\#629](https://github.com/cmderdev/cmder/issues/629)
+-  msysGit has been superseded ,consider to switch to Git for Windows 2.x? [\#627](https://github.com/cmderdev/cmder/issues/627)
+- tail command not found [\#625](https://github.com/cmderdev/cmder/issues/625)
+- Cmder console remain unused text on screen [\#623](https://github.com/cmderdev/cmder/issues/623)
+- how i can change the mysysgit folder [\#620](https://github.com/cmderdev/cmder/issues/620)
+- er con emu [\#617](https://github.com/cmderdev/cmder/issues/617)
+- first google hit for cmder shows 404 [\#616](https://github.com/cmderdev/cmder/issues/616)
+- \[ Solved \] How to I change to width of Split screen divider \( border \) line.  [\#613](https://github.com/cmderdev/cmder/issues/613)
+- No Unix commands? [\#610](https://github.com/cmderdev/cmder/issues/610)
+- using user installed git \(2.5\) with the suggested /bin/agent.cmd does not work [\#609](https://github.com/cmderdev/cmder/issues/609)
+- vendor/init.bat is overwritten with new versions -\> use a user startup file? [\#608](https://github.com/cmderdev/cmder/issues/608)
+- Git autocomplete is not working as in git bash [\#607](https://github.com/cmderdev/cmder/issues/607)
+- api-ms-win-crt-runtime-l1-1-0.dll is missing error \(Windows 8.1\) [\#604](https://github.com/cmderdev/cmder/issues/604)
+- Prevent inactive cmder windows to be dimmed [\#603](https://github.com/cmderdev/cmder/issues/603)
+- Git for Windows 2.5 [\#602](https://github.com/cmderdev/cmder/issues/602)
+- Incompatibility with conemu 150716+ / double pinned icon on taskbar [\#599](https://github.com/cmderdev/cmder/issues/599)
+- Cant get it working on windows xp [\#598](https://github.com/cmderdev/cmder/issues/598)
+- ls parameters error in Windows 10 [\#597](https://github.com/cmderdev/cmder/issues/597)
+- Resizing split windows [\#596](https://github.com/cmderdev/cmder/issues/596)
+- PowerShell Profile Aliases ignored in Cmder [\#593](https://github.com/cmderdev/cmder/issues/593)
+- "Inject ConEmuHk" settings slows git down considerably [\#592](https://github.com/cmderdev/cmder/issues/592)
+- Suggestion about transparency [\#591](https://github.com/cmderdev/cmder/issues/591)
+- Wrong place [\#589](https://github.com/cmderdev/cmder/issues/589)
+- Misleading install instructions? [\#588](https://github.com/cmderdev/cmder/issues/588)
+- ENHANCE: Only add git to path if not exist [\#586](https://github.com/cmderdev/cmder/issues/586)
+- new console confirmation - with Ctrl-T [\#583](https://github.com/cmderdev/cmder/issues/583)
+- start-ssh-agent not found [\#580](https://github.com/cmderdev/cmder/issues/580)
+- Missing DLL [\#579](https://github.com/cmderdev/cmder/issues/579)
+- windows 10 incompatibility [\#572](https://github.com/cmderdev/cmder/issues/572)
+- FIX: Incorrect startup directory. [\#571](https://github.com/cmderdev/cmder/issues/571)
+- WARNING: Enable-GitColors is Obsolete and will be removed in a future version of posh-git. [\#568](https://github.com/cmderdev/cmder/issues/568)
+- Path issue on startup - Invalid download path [\#567](https://github.com/cmderdev/cmder/issues/567)
+- The term 'vim' is not recognized [\#566](https://github.com/cmderdev/cmder/issues/566)
+- Persist tab "View \(palette\)" selection [\#562](https://github.com/cmderdev/cmder/issues/562)
+- git add --interactive fails [\#560](https://github.com/cmderdev/cmder/issues/560)
+- Tab names as directory names [\#559](https://github.com/cmderdev/cmder/issues/559)
+- Downloads for v1.2 missing DLLs [\#558](https://github.com/cmderdev/cmder/issues/558)
+- Can't get rid of "unrecognized parameter" error [\#557](https://github.com/cmderdev/cmder/issues/557)
+- How to use cmder in a batch file? [\#556](https://github.com/cmderdev/cmder/issues/556)
+- Run init.bat before any new scripts [\#554](https://github.com/cmderdev/cmder/issues/554)
+- ssh not working [\#552](https://github.com/cmderdev/cmder/issues/552)
+- Restore opened tabs setting opens root drive [\#551](https://github.com/cmderdev/cmder/issues/551)
+- Maximize single view/terminal/console to whole window [\#550](https://github.com/cmderdev/cmder/issues/550)
+- not run  successfully  [\#547](https://github.com/cmderdev/cmder/issues/547)
+- compass not working with cmder ? [\#546](https://github.com/cmderdev/cmder/issues/546)
+- Bad unicode support \(wrong glyphs on alsamixer\) [\#545](https://github.com/cmderdev/cmder/issues/545)
+- can we use Vundle to manage Cmder's vim plugins? Need some setup? [\#535](https://github.com/cmderdev/cmder/issues/535)
+- Error on Windows 7 [\#534](https://github.com/cmderdev/cmder/issues/534)
+- api-ms-win-crt-runtime l1-109.dll is missing [\#531](https://github.com/cmderdev/cmder/issues/531)
+- conhost.exe keeps on crashing. [\#527](https://github.com/cmderdev/cmder/issues/527)
+- Cmder crashes when AVG falsely flags it as a virus. [\#522](https://github.com/cmderdev/cmder/issues/522)
+- Incomplete git installation packaged with cmder v1.2  [\#521](https://github.com/cmderdev/cmder/issues/521)
+- api-ms-win-crt-runtime-l1-1-0.dll error [\#518](https://github.com/cmderdev/cmder/issues/518)
+- Can't set alias in 1.2 anymore  [\#515](https://github.com/cmderdev/cmder/issues/515)
+- git not properly setup in v1.2 [\#513](https://github.com/cmderdev/cmder/issues/513)
+- Git: fatal: Unable to find remote helper for 'https' [\#503](https://github.com/cmderdev/cmder/issues/503)
+- api-ms-win-crt-runtime-l1-1-0.dll error [\#501](https://github.com/cmderdev/cmder/issues/501)
+- gitk not found due to changed PATH for msysgit  [\#498](https://github.com/cmderdev/cmder/issues/498)
+- {hg} on every folder [\#494](https://github.com/cmderdev/cmder/issues/494)
+- Missing dll, APPCRT140.dll [\#485](https://github.com/cmderdev/cmder/issues/485)
+- Symantec refuses to access cmder [\#484](https://github.com/cmderdev/cmder/issues/484)
+- Missing MSVCP140.dll [\#480](https://github.com/cmderdev/cmder/issues/480)
+- Windows 10 compatibility issues [\#478](https://github.com/cmderdev/cmder/issues/478)
+- update msysgit [\#473](https://github.com/cmderdev/cmder/issues/473)
+- Notifications about composer.json and CRLF [\#472](https://github.com/cmderdev/cmder/issues/472)
+- How to add more commands beyond mysisgit? [\#470](https://github.com/cmderdev/cmder/issues/470)
+- ~ should mean user home directory [\#466](https://github.com/cmderdev/cmder/issues/466)
+- mklink /d creates symlink with wrong slashes [\#462](https://github.com/cmderdev/cmder/issues/462)
+- Does cmder come with GCC or not? [\#461](https://github.com/cmderdev/cmder/issues/461)
+- Question: How to start cmder with a command [\#457](https://github.com/cmderdev/cmder/issues/457)
+- PATH environment variable has space problem [\#456](https://github.com/cmderdev/cmder/issues/456)
+- Feature  Request : Save opened tabs and locations of the tabs [\#455](https://github.com/cmderdev/cmder/issues/455)
+- Error on cmder launch: "The syntax of the command is incorrect" [\#454](https://github.com/cmderdev/cmder/issues/454)
+- Lag returning to prompt \(especially\) in git repo [\#447](https://github.com/cmderdev/cmder/issues/447)
+- 'MySQL' is not recognized as an internal or external command, operable program or batch file. [\#443](https://github.com/cmderdev/cmder/issues/443)
+- Not scaling on Windows 8.1 with High-DPI Monitor [\#437](https://github.com/cmderdev/cmder/issues/437)
+- Shortcut missing icon in context menu [\#433](https://github.com/cmderdev/cmder/issues/433)
+- How to update Git? [\#428](https://github.com/cmderdev/cmder/issues/428)
+- How to redirect Window's cmd.exe to Cmder's cmder.exe? [\#426](https://github.com/cmderdev/cmder/issues/426)
+- cmder exits with exitcode 4294967295 [\#423](https://github.com/cmderdev/cmder/issues/423)
+- How do you create an alias? [\#421](https://github.com/cmderdev/cmder/issues/421)
+- Git pull not working [\#419](https://github.com/cmderdev/cmder/issues/419)
+- Create files from cmder. [\#417](https://github.com/cmderdev/cmder/issues/417)
+- Error popup window on opening [\#416](https://github.com/cmderdev/cmder/issues/416)
+- Vim help not working in cmder [\#415](https://github.com/cmderdev/cmder/issues/415)
+- How to update bash [\#399](https://github.com/cmderdev/cmder/issues/399)
+- could you put the version number into the download file [\#396](https://github.com/cmderdev/cmder/issues/396)
+- Cmder unable to find .ssh folder [\#387](https://github.com/cmderdev/cmder/issues/387)
+- extra character appears at the beginning,when used the arrow keys\(up,down\) navigate through the history  [\#384](https://github.com/cmderdev/cmder/issues/384)
+- create alias with multi word parameter [\#376](https://github.com/cmderdev/cmder/issues/376)
+- UI broken characters [\#375](https://github.com/cmderdev/cmder/issues/375)
+- Possible to change TSA icon? [\#373](https://github.com/cmderdev/cmder/issues/373)
+- Is Cmder known to cause a false positive alert from some virus checking software? [\#371](https://github.com/cmderdev/cmder/issues/371)
+- How to disable the crosshair [\#369](https://github.com/cmderdev/cmder/issues/369)
+- Text reflow and line selection [\#359](https://github.com/cmderdev/cmder/issues/359)
+- Git client side vulnerability  [\#354](https://github.com/cmderdev/cmder/issues/354)
+- Ctrl+Shift+Arrow does not work as expected [\#345](https://github.com/cmderdev/cmder/issues/345)
+- i can not read windows path in cmder [\#342](https://github.com/cmderdev/cmder/issues/342)
+- How to reload system variable [\#340](https://github.com/cmderdev/cmder/issues/340)
+- SVN commands support [\#339](https://github.com/cmderdev/cmder/issues/339)
+- Is it possible to show the current folder in front of cursor on the current line? [\#338](https://github.com/cmderdev/cmder/issues/338)
+- backspace not work [\#334](https://github.com/cmderdev/cmder/issues/334)
+- 'awk' is not recognized [\#330](https://github.com/cmderdev/cmder/issues/330)
+- Cannot pin 1.1.4.1 to Win7 taskbar [\#329](https://github.com/cmderdev/cmder/issues/329)
+- {lamb} instead of lambda sign \(possibly a UTF-8 problem?\) [\#322](https://github.com/cmderdev/cmder/issues/322)
+- Instructions refer to Cmder.bat but it doesn't exist in download .zip [\#319](https://github.com/cmderdev/cmder/issues/319)
+- Wrong link on https://bliker.github.io/cmder/ for msysgit [\#317](https://github.com/cmderdev/cmder/issues/317)
+- Use system-wide Git [\#315](https://github.com/cmderdev/cmder/issues/315)
+- Version update information is broken \(not found\) [\#310](https://github.com/cmderdev/cmder/issues/310)
+- feature request vim-airline [\#306](https://github.com/cmderdev/cmder/issues/306)
+- Full Screen [\#295](https://github.com/cmderdev/cmder/issues/295)
+- Configure Powershell to match CMD [\#294](https://github.com/cmderdev/cmder/issues/294)
+- Tab Close on CTRL-W [\#293](https://github.com/cmderdev/cmder/issues/293)
+- v1.1.4.1 /REGISTER ALL has broken icon [\#292](https://github.com/cmderdev/cmder/issues/292)
+- CD in root not working.. [\#289](https://github.com/cmderdev/cmder/issues/289)
+- How to enable 256 color? [\#288](https://github.com/cmderdev/cmder/issues/288)
+- Executing linux executables ./ doesn't work :S [\#285](https://github.com/cmderdev/cmder/issues/285)
+- er [\#283](https://github.com/cmderdev/cmder/issues/283)
+- \[1.1.4.1\] Auto Completion not working [\#280](https://github.com/cmderdev/cmder/issues/280)
+- Git and lamb macro/symbols not expanded in Windows 10 preview [\#279](https://github.com/cmderdev/cmder/issues/279)
+- cmder vs cmd using non-blocking STDIN [\#269](https://github.com/cmderdev/cmder/issues/269)
+- Possible to blur translucent console? [\#267](https://github.com/cmderdev/cmder/issues/267)
+- Duplicate Root Fires Twice? [\#266](https://github.com/cmderdev/cmder/issues/266)
+- utils [\#260](https://github.com/cmderdev/cmder/issues/260)
+- Character mix [\#259](https://github.com/cmderdev/cmder/issues/259)
+- strange issue no trace in google  [\#257](https://github.com/cmderdev/cmder/issues/257)
+- Can't start cmder 1.4.1.1 [\#252](https://github.com/cmderdev/cmder/issues/252)
+- Cmder icon reverts to ConEmu icon when "Startup options" option is changed [\#251](https://github.com/cmderdev/cmder/issues/251)
+- Old version files in v1.1.4 release archives [\#247](https://github.com/cmderdev/cmder/issues/247)
+- "MSVCP120.dll is missing from your computer." [\#246](https://github.com/cmderdev/cmder/issues/246)
+- Cmder.exe not opening on Windows 7 SP 1 [\#240](https://github.com/cmderdev/cmder/issues/240)
+- Resize Tab Bar [\#236](https://github.com/cmderdev/cmder/issues/236)
+- Clicking in the window causes cmder to lock up [\#232](https://github.com/cmderdev/cmder/issues/232)
+- Add cmder to Windows context menu [\#231](https://github.com/cmderdev/cmder/issues/231)
+- libiconv-2.dll is missing [\#228](https://github.com/cmderdev/cmder/issues/228)
+- Can't create process, ErrCode=0x000000C1, Description: %1 is not a valid Win32 application. [\#226](https://github.com/cmderdev/cmder/issues/226)
+- Cant get powerline fonts to work \(need utf-8?\) [\#225](https://github.com/cmderdev/cmder/issues/225)
+- Can't use aliases + && [\#224](https://github.com/cmderdev/cmder/issues/224)
+- {git}, {lamb} and strange new console options [\#223](https://github.com/cmderdev/cmder/issues/223)
+- Wire up 'title' to "rename tab" [\#221](https://github.com/cmderdev/cmder/issues/221)
+- system PATH overriding path set in init.bat [\#219](https://github.com/cmderdev/cmder/issues/219)
+- command autocompletion not working [\#218](https://github.com/cmderdev/cmder/issues/218)
+- Closes tab on Ctrl-C action [\#215](https://github.com/cmderdev/cmder/issues/215)
+- Problems with vim colors [\#213](https://github.com/cmderdev/cmder/issues/213)
+- lambda bug when i install clink [\#212](https://github.com/cmderdev/cmder/issues/212)
+- Did doskey break in the newest dev update? [\#207](https://github.com/cmderdev/cmder/issues/207)
+- Bug within the version of msysgit 1.8.5.2 [\#206](https://github.com/cmderdev/cmder/issues/206)
+- SSH Keys and push passphrase [\#202](https://github.com/cmderdev/cmder/issues/202)
+- git diff highlight colors on ssh [\#201](https://github.com/cmderdev/cmder/issues/201)
+- Cursor becomes fat, and i can't do anything [\#200](https://github.com/cmderdev/cmder/issues/200)
+- include zsh and tmux from cygwin [\#194](https://github.com/cmderdev/cmder/issues/194)
+- How to enable ssh-agent? [\#193](https://github.com/cmderdev/cmder/issues/193)
+- Open cmder in 64-bit on 64-bit windows [\#191](https://github.com/cmderdev/cmder/issues/191)
+- Running cmder from the file explorer [\#187](https://github.com/cmderdev/cmder/issues/187)
+- how to config installed msysgit  [\#183](https://github.com/cmderdev/cmder/issues/183)
+- Windows 8.1 High-DPI Scaling [\#182](https://github.com/cmderdev/cmder/issues/182)
+- how to disabled command line error beep? [\#179](https://github.com/cmderdev/cmder/issues/179)
+- Crash at start on Windows 8.1 [\#176](https://github.com/cmderdev/cmder/issues/176)
+- Crashes with mintty.exe [\#175](https://github.com/cmderdev/cmder/issues/175)
+- Chinese characters looked terribly awful when monospace is checked [\#171](https://github.com/cmderdev/cmder/issues/171)
+- Copy and paste w/ mouse buttons [\#170](https://github.com/cmderdev/cmder/issues/170)
+- Lambda prompt bug [\#164](https://github.com/cmderdev/cmder/issues/164)
+- Can't select and copy text [\#163](https://github.com/cmderdev/cmder/issues/163)
+- not running in windows XP SP3 [\#161](https://github.com/cmderdev/cmder/issues/161)
+- german characters not displaying [\#160](https://github.com/cmderdev/cmder/issues/160)
+- Transparent image. A Detail but I would like to get it to work [\#156](https://github.com/cmderdev/cmder/issues/156)
+- Taskbar icon after pinning the program reverts to default ConEmu icon. Systray icon is always ConEmu's. [\#154](https://github.com/cmderdev/cmder/issues/154)
+- A neat way to add sublime text seamlessly. [\#153](https://github.com/cmderdev/cmder/issues/153)
+- how to update cygwin shipped together within cmder [\#151](https://github.com/cmderdev/cmder/issues/151)
+- The system cannot find the path specified. [\#148](https://github.com/cmderdev/cmder/issues/148)
+- Changes to PATH do not persist [\#146](https://github.com/cmderdev/cmder/issues/146)
+- git clone templates not found / Unable to find remote helper for 'https' [\#144](https://github.com/cmderdev/cmder/issues/144)
+- handle could not be opened / terminal is not fully functional [\#143](https://github.com/cmderdev/cmder/issues/143)
+- Auto-create fast new tab shortcuts for additional tasks [\#140](https://github.com/cmderdev/cmder/issues/140)
+- ssh-agent, ssh-add, ssh all crash as soon as I open a PowerShell window [\#139](https://github.com/cmderdev/cmder/issues/139)
+- Problems using cmder as an SSH client [\#137](https://github.com/cmderdev/cmder/issues/137)
+- Add link to bliker.github.io/cmder to repo description/website [\#134](https://github.com/cmderdev/cmder/issues/134)
+- Environmental variables are not reloaded on new console [\#132](https://github.com/cmderdev/cmder/issues/132)
+- Git Branch Autocomplete [\#130](https://github.com/cmderdev/cmder/issues/130)
+- The nice lambda left me :\( [\#129](https://github.com/cmderdev/cmder/issues/129)
+- `ls` with output redirection writes ansi escape sequences to destination file [\#127](https://github.com/cmderdev/cmder/issues/127)
+- Lamba prompt and git status scripts not running [\#126](https://github.com/cmderdev/cmder/issues/126)
+- how to open specail directory? in sublime Terminal plugin? [\#123](https://github.com/cmderdev/cmder/issues/123)
+- clink installed allready cmder hangs after install [\#122](https://github.com/cmderdev/cmder/issues/122)
+- "The system cannot find the path specified" [\#121](https://github.com/cmderdev/cmder/issues/121)
+- "chcp 65001" \(UTF-8\) support for cmd [\#119](https://github.com/cmderdev/cmder/issues/119)
+- Incorrect version of clink is being used [\#117](https://github.com/cmderdev/cmder/issues/117)
+- .bash\_profile equivalent? [\#113](https://github.com/cmderdev/cmder/issues/113)
+- Startup directory on new tab [\#112](https://github.com/cmderdev/cmder/issues/112)
+- Looking for a contributor/Cmder user [\#110](https://github.com/cmderdev/cmder/issues/110)
+- Terminate batch job bug \(I think?\) [\#108](https://github.com/cmderdev/cmder/issues/108)
+- latin1 characters [\#107](https://github.com/cmderdev/cmder/issues/107)
+- Script cleanup [\#105](https://github.com/cmderdev/cmder/issues/105)
+- Changed "λ"  to "?" [\#104](https://github.com/cmderdev/cmder/issues/104)
+- How to search history using PgUp and PgDown [\#103](https://github.com/cmderdev/cmder/issues/103)
+- Folder shortcuts doesn't seem to work in FAR manager under cmder [\#102](https://github.com/cmderdev/cmder/issues/102)
+- opening cmder.bat on windows 8 [\#101](https://github.com/cmderdev/cmder/issues/101)
+- Change the builder from google code [\#99](https://github.com/cmderdev/cmder/issues/99)
+- Text color not honored upon restart [\#97](https://github.com/cmderdev/cmder/issues/97)
+- Launcher is not recognized as a valid Win32 application on windows XP. [\#96](https://github.com/cmderdev/cmder/issues/96)
+- Allow the launcher to be pinned to the taskbar [\#95](https://github.com/cmderdev/cmder/issues/95)
+- VS2013 runtime requirement [\#93](https://github.com/cmderdev/cmder/issues/93)
+- git flow [\#92](https://github.com/cmderdev/cmder/issues/92)
+- How to start in a given directory [\#91](https://github.com/cmderdev/cmder/issues/91)
+- Can't type backslash \(clink issue\) [\#89](https://github.com/cmderdev/cmder/issues/89)
+- command history [\#87](https://github.com/cmderdev/cmder/issues/87)
+- Install cmder [\#86](https://github.com/cmderdev/cmder/issues/86)
+- Can not work well with Chinese [\#81](https://github.com/cmderdev/cmder/issues/81)
+- Does not work with Julia [\#80](https://github.com/cmderdev/cmder/issues/80)
+- Build script does not work through proxy [\#79](https://github.com/cmderdev/cmder/issues/79)
+- "C:\Users\bliker" reference in config/ConEmu.xml [\#71](https://github.com/cmderdev/cmder/issues/71)
+- Is it possible to install wget into cmder\(clink, or ConEmu\) ? [\#69](https://github.com/cmderdev/cmder/issues/69)
+- cyrillic characters problem [\#68](https://github.com/cmderdev/cmder/issues/68)
+- Unable to run in Windows XP if path contains spaces [\#67](https://github.com/cmderdev/cmder/issues/67)
+- Path not set correctly on Windows XP [\#66](https://github.com/cmderdev/cmder/issues/66)
+- Filenames with special characters e.g. ! are not handled correctly [\#64](https://github.com/cmderdev/cmder/issues/64)
+- Clink completion does not work [\#59](https://github.com/cmderdev/cmder/issues/59)
+- Git hosts defined in .ssh/config not working in cmder [\#58](https://github.com/cmderdev/cmder/issues/58)
+- Setting cmder startup directory. [\#57](https://github.com/cmderdev/cmder/issues/57)
+- cmder doesn't work with gvim [\#55](https://github.com/cmderdev/cmder/issues/55)
+- vendor\msysgit\libexec\git-core dir contains 1.45mb git.exe duplicated 110 times.  [\#54](https://github.com/cmderdev/cmder/issues/54)
+- "terminal is not fully functional" [\#50](https://github.com/cmderdev/cmder/issues/50)
+- Open new tab as Admin by default. [\#49](https://github.com/cmderdev/cmder/issues/49)
+- Chinese characters overlapped [\#45](https://github.com/cmderdev/cmder/issues/45)
+- `screen irssi`, `mutt` - Cannot find terminfo entry for 'msys'. [\#44](https://github.com/cmderdev/cmder/issues/44)
+- ps doesn't work [\#43](https://github.com/cmderdev/cmder/issues/43)
+- Pinning Cmder to taskbar doesn't work as expected [\#39](https://github.com/cmderdev/cmder/issues/39)
+- Prompt does not work with clink 0.4 [\#35](https://github.com/cmderdev/cmder/issues/35)
+- vendor/init.bat fails on paths with spaces [\#28](https://github.com/cmderdev/cmder/issues/28)
+- "windows cannot find ...\cmder\vendor/conemu-maximus5/ConEmu.exe" [\#27](https://github.com/cmderdev/cmder/issues/27)
+- Issue with SSH and tmux [\#25](https://github.com/cmderdev/cmder/issues/25)
+- PWD, VI, VIM commands don't work on windows 7.  [\#23](https://github.com/cmderdev/cmder/issues/23)
+- Include icon [\#21](https://github.com/cmderdev/cmder/issues/21)
+- init.bat failing on Vista x64 [\#19](https://github.com/cmderdev/cmder/issues/19)
+- Not possible to write @ on Norwegian keyboard [\#17](https://github.com/cmderdev/cmder/issues/17)
+- Weird output when starting cmder [\#16](https://github.com/cmderdev/cmder/issues/16)
+- Set a name for the Tab on a task [\#14](https://github.com/cmderdev/cmder/issues/14)
+- Git branch name [\#13](https://github.com/cmderdev/cmder/issues/13)
+- bin directories not loaded in path [\#12](https://github.com/cmderdev/cmder/issues/12)
+- Cmder ssh keys for github [\#11](https://github.com/cmderdev/cmder/issues/11)
+- How to use cmder with integration mode [\#10](https://github.com/cmderdev/cmder/issues/10)
+- tab manipulation problem [\#9](https://github.com/cmderdev/cmder/issues/9)
+- Remove ugly black startup window [\#8](https://github.com/cmderdev/cmder/issues/8)
+- Unable to `cd` to another drive [\#6](https://github.com/cmderdev/cmder/issues/6)
+- cant change start directory [\#4](https://github.com/cmderdev/cmder/issues/4)
+- lalt + arrow left/right not working as a macro hotkey [\#3](https://github.com/cmderdev/cmder/issues/3)
+- alt gr + 2 opens new powershell [\#2](https://github.com/cmderdev/cmder/issues/2)
+- Gvim preferences are not used in {cmd} [\#1](https://github.com/cmderdev/cmder/issues/1)
+
+**Merged pull requests:**
+
+- Merge latest Development [\#890](https://github.com/cmderdev/cmder/pull/890) ([MartiUK](https://github.com/MartiUK))
+- Process profile.d scripts before adding user aliases [\#874](https://github.com/cmderdev/cmder/pull/874) ([daxgames](https://github.com/daxgames))
+- Prefer use of first line @echo off vs. @ per line to turn off echo pe… [\#873](https://github.com/cmderdev/cmder/pull/873) ([daxgames](https://github.com/daxgames))
+- silenced bash profile.d when profile.d is empty [\#872](https://github.com/cmderdev/cmder/pull/872) ([daxgames](https://github.com/daxgames))
+- Various fixes for profile.d support [\#867](https://github.com/cmderdev/cmder/pull/867) ([daxgames](https://github.com/daxgames))
+- Revert "Set CMDER\_START to homeprofile" [\#866](https://github.com/cmderdev/cmder/pull/866) ([janschulz](https://github.com/janschulz))
+- Fix cmd plugin.d [\#860](https://github.com/cmderdev/cmder/pull/860) ([daxgames](https://github.com/daxgames))
+- Added profile.d like support for all supported shells [\#855](https://github.com/cmderdev/cmder/pull/855) ([daxgames](https://github.com/daxgames))
+- Typo in Readme.md [\#852](https://github.com/cmderdev/cmder/pull/852) ([janschulz](https://github.com/janschulz))
+- Fixed get\_git\_dir\(\) to take submodules into account. Fixes \#833 [\#841](https://github.com/cmderdev/cmder/pull/841) ([gpakosz](https://github.com/gpakosz))
+- Add appveyor batch to README [\#837](https://github.com/cmderdev/cmder/pull/837) ([janschulz](https://github.com/janschulz))
+- Fixed checkGit\(\) in case of submodules [\#835](https://github.com/cmderdev/cmder/pull/835) ([gpakosz](https://github.com/gpakosz))
+- 1.3 Pre-Release Merge [\#831](https://github.com/cmderdev/cmder/pull/831) ([MartiUK](https://github.com/MartiUK))
+- Fix build script not exiting on msbuild failure. [\#804](https://github.com/cmderdev/cmder/pull/804) ([MartiUK](https://github.com/MartiUK))
+- Set tasks to always use CMDER\_START [\#803](https://github.com/cmderdev/cmder/pull/803) ([MartiUK](https://github.com/MartiUK))
+- Make "cmder here" work again [\#798](https://github.com/cmderdev/cmder/pull/798) ([janschulz](https://github.com/janschulz))
+- Reorganize how clink settings are loaded [\#794](https://github.com/cmderdev/cmder/pull/794) ([janschulz](https://github.com/janschulz))
+- Bump clink to 0.4.6 [\#781](https://github.com/cmderdev/cmder/pull/781) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Fix vendor/init.bat when the PATH contains spaces. [\#773](https://github.com/cmderdev/cmder/pull/773) ([glureau](https://github.com/glureau))
+- Merge latest development [\#771](https://github.com/cmderdev/cmder/pull/771) ([MartiUK](https://github.com/MartiUK))
+- Bump clink-completions to 0.2.2 [\#766](https://github.com/cmderdev/cmder/pull/766) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Fix: don't garble the input line for long lines in git projects [\#756](https://github.com/cmderdev/cmder/pull/756) ([janschulz](https://github.com/janschulz))
+- README.md Updates [\#746](https://github.com/cmderdev/cmder/pull/746) ([daxgames](https://github.com/daxgames))
+- Cmder exinit [\#740](https://github.com/cmderdev/cmder/pull/740) ([daxgames](https://github.com/daxgames))
+- added config\user-\* to packignore [\#738](https://github.com/cmderdev/cmder/pull/738) ([daxgames](https://github.com/daxgames))
+- Use consistent naming: user-profile.{sh|bat|ps1} [\#737](https://github.com/cmderdev/cmder/pull/737) ([janschulz](https://github.com/janschulz))
+- More config [\#736](https://github.com/cmderdev/cmder/pull/736) ([janschulz](https://github.com/janschulz))
+- Do not overwrite aliases on update [\#735](https://github.com/cmderdev/cmder/pull/735) ([janschulz](https://github.com/janschulz))
+- Added check for git install path in init.bat. [\#734](https://github.com/cmderdev/cmder/pull/734) ([chase-miller](https://github.com/chase-miller))
+- Fix icons [\#731](https://github.com/cmderdev/cmder/pull/731) ([daxgames](https://github.com/daxgames))
+- Fixed - Powershell vim/vim alias opening a new tab when editing a file [\#729](https://github.com/cmderdev/cmder/pull/729) ([daxgames](https://github.com/daxgames))
+- Added vi/vim aliases and fixed powershell startup errors [\#726](https://github.com/cmderdev/cmder/pull/726) ([daxgames](https://github.com/daxgames))
+- Release 1.3 [\#723](https://github.com/cmderdev/cmder/pull/723) ([MartiUK](https://github.com/MartiUK))
+- Update to conemu 151119 [\#722](https://github.com/cmderdev/cmder/pull/722) ([MartiUK](https://github.com/MartiUK))
+- Disable appveyor test search [\#720](https://github.com/cmderdev/cmder/pull/720) ([MartiUK](https://github.com/MartiUK))
+- Fix gitter webhook [\#719](https://github.com/cmderdev/cmder/pull/719) ([MartiUK](https://github.com/MartiUK))
+- Publish appveyor artefacts [\#718](https://github.com/cmderdev/cmder/pull/718) ([MartiUK](https://github.com/MartiUK))
+- add bundled vim to path [\#705](https://github.com/cmderdev/cmder/pull/705) ([wenzowski](https://github.com/wenzowski))
+- Fix batch files [\#698](https://github.com/cmderdev/cmder/pull/698) ([daxgames](https://github.com/daxgames))
+- Speed up git prompt filtering [\#697](https://github.com/cmderdev/cmder/pull/697) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Upgrade clink-completions to 0.2.1 [\#676](https://github.com/cmderdev/cmder/pull/676) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Enable the '/single' switch \(\#577\) [\#673](https://github.com/cmderdev/cmder/pull/673) ([DoCode](https://github.com/DoCode))
+- Fixed problem with Invoke-Expression [\#667](https://github.com/cmderdev/cmder/pull/667) ([Pireax](https://github.com/Pireax))
+- Add user startup file for powershell [\#666](https://github.com/cmderdev/cmder/pull/666) ([Pireax](https://github.com/Pireax))
+- Build from behind proxy & appveyor [\#665](https://github.com/cmderdev/cmder/pull/665) ([MartiUK](https://github.com/MartiUK))
+- Fix init.bat generation [\#663](https://github.com/cmderdev/cmder/pull/663) ([janschulz](https://github.com/janschulz))
+- Upgrade clink-completions to 0.2.0 [\#653](https://github.com/cmderdev/cmder/pull/653) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Make wording clearer [\#652](https://github.com/cmderdev/cmder/pull/652) ([jkingsman](https://github.com/jkingsman))
+- fix typos and better phrasing [\#651](https://github.com/cmderdev/cmder/pull/651) ([jkingsman](https://github.com/jkingsman))
+- Revert 8b8f98c [\#634](https://github.com/cmderdev/cmder/pull/634) ([Stanzilla](https://github.com/Stanzilla))
+- Update clink to 0.4.5 [\#619](https://github.com/cmderdev/cmder/pull/619) ([Stanzilla](https://github.com/Stanzilla))
+- Add a user startup file which can be modified [\#612](https://github.com/cmderdev/cmder/pull/612) ([janschulz](https://github.com/janschulz))
+- Update README.md [\#606](https://github.com/cmderdev/cmder/pull/606) ([pyprism](https://github.com/pyprism))
+- Converting msysgit support to git-for-windows support. [\#605](https://github.com/cmderdev/cmder/pull/605) ([Stanzilla](https://github.com/Stanzilla))
+- :arrow\_up: ConEmu@150816 [\#601](https://github.com/cmderdev/cmder/pull/601) ([Stanzilla](https://github.com/Stanzilla))
+- Use standard path for ConEmu.xml [\#600](https://github.com/cmderdev/cmder/pull/600) ([Maximus5](https://github.com/Maximus5))
+- Revert "Run PowerShell as default" [\#585](https://github.com/cmderdev/cmder/pull/585) ([Stanzilla](https://github.com/Stanzilla))
+- update VS to 2015 release version and switch to /MT for static linking [\#578](https://github.com/cmderdev/cmder/pull/578) ([Stanzilla](https://github.com/Stanzilla))
+- Enhance Path in profile.ps1 [\#575](https://github.com/cmderdev/cmder/pull/575) ([Bobo1239](https://github.com/Bobo1239))
+- Fixed: 'Enable-GitColors is Obsolete...' warning [\#569](https://github.com/cmderdev/cmder/pull/569) ([eeree](https://github.com/eeree))
+- Update .gitignore [\#548](https://github.com/cmderdev/cmder/pull/548) ([thomgit](https://github.com/thomgit))
+- Add  `-ExecutionPolicy Bypass` to powershell tasks [\#543](https://github.com/cmderdev/cmder/pull/543) ([malobre](https://github.com/malobre))
+- Remove depreciated Enable-GitColors in posh-git [\#517](https://github.com/cmderdev/cmder/pull/517) ([bondz](https://github.com/bondz))
+- Fix cleanup script. [\#479](https://github.com/cmderdev/cmder/pull/479) ([MartiUK](https://github.com/MartiUK))
+- Fix link to msysgit's site. Google's repo was moved or removed. [\#465](https://github.com/cmderdev/cmder/pull/465) ([TheMolkaPL](https://github.com/TheMolkaPL))
+- Update sources.json [\#451](https://github.com/cmderdev/cmder/pull/451) ([MartiUK](https://github.com/MartiUK))
+- Merge development into master for 1.2 [\#450](https://github.com/cmderdev/cmder/pull/450) ([MartiUK](https://github.com/MartiUK))
+- Helper function using powershell to register the cmder context menu [\#441](https://github.com/cmderdev/cmder/pull/441) ([Jackbennett](https://github.com/Jackbennett))
+- git and Posh-git check [\#440](https://github.com/cmderdev/cmder/pull/440) ([Jackbennett](https://github.com/Jackbennett))
+- Improves performance of prompt filtering [\#438](https://github.com/cmderdev/cmder/pull/438) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Preview PR for including external completions into Cmder [\#434](https://github.com/cmderdev/cmder/pull/434) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Revert new line from commit dc834cc28f [\#432](https://github.com/cmderdev/cmder/pull/432) ([Jackbennett](https://github.com/Jackbennett))
+- Leverage the Module Autoload path and save doing it ourselves. [\#431](https://github.com/cmderdev/cmder/pull/431) ([Jackbennett](https://github.com/Jackbennett))
+- Adds support for PS 4.0 native hash command to remove a dependency [\#430](https://github.com/cmderdev/cmder/pull/430) ([Jackbennett](https://github.com/Jackbennett))
+- Fix build script removing a trailing comma. Download into a temp folder. [\#429](https://github.com/cmderdev/cmder/pull/429) ([Jackbennett](https://github.com/Jackbennett))
+- Update clink url [\#425](https://github.com/cmderdev/cmder/pull/425) ([danneu](https://github.com/danneu))
+- Added git shell task. [\#422](https://github.com/cmderdev/cmder/pull/422) ([ragekit](https://github.com/ragekit))
+- Public site docs update matching the repo readme [\#411](https://github.com/cmderdev/cmder/pull/411) ([Jackbennett](https://github.com/Jackbennett))
+- Install steps clarity [\#410](https://github.com/cmderdev/cmder/pull/410) ([Jackbennett](https://github.com/Jackbennett))
+- Update Conemu \<preview release\>, update clink 4.4 [\#407](https://github.com/cmderdev/cmder/pull/407) ([Jackbennett](https://github.com/Jackbennett))
+- Use a -Full parameter to download all sources rather than the minimum [\#406](https://github.com/cmderdev/cmder/pull/406) ([Jackbennett](https://github.com/Jackbennett))
+- Adding mercuial prompt [\#401](https://github.com/cmderdev/cmder/pull/401) ([utek](https://github.com/utek))
+- Handle quoted paths [\#398](https://github.com/cmderdev/cmder/pull/398) ([mikesigs](https://github.com/mikesigs))
+- Add a Gitter chat badge to README.md [\#390](https://github.com/cmderdev/cmder/pull/390) ([gitter-badger](https://github.com/gitter-badger))
+- Support UTF-8 file list [\#378](https://github.com/cmderdev/cmder/pull/378) ([asika32764](https://github.com/asika32764))
+- Updated vendor references [\#374](https://github.com/cmderdev/cmder/pull/374) ([CumpsD](https://github.com/CumpsD))
+- Prefer user installed git over cmder one. [\#364](https://github.com/cmderdev/cmder/pull/364) ([narnaud](https://github.com/narnaud))
+- Update clink to latest \(0.4.3\) version [\#362](https://github.com/cmderdev/cmder/pull/362) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Rework `alias` command to not to use external tools [\#358](https://github.com/cmderdev/cmder/pull/358) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Updating to msysgit 1.9.5 [\#353](https://github.com/cmderdev/cmder/pull/353) ([Celeo](https://github.com/Celeo))
+- Adding script to enable SSH-agent \#193 [\#352](https://github.com/cmderdev/cmder/pull/352) ([ogrim](https://github.com/ogrim))
+- Docs update for issue \#319 [\#337](https://github.com/cmderdev/cmder/pull/337) ([Jackbennett](https://github.com/Jackbennett))
+- changes copied from PR\#256 [\#326](https://github.com/cmderdev/cmder/pull/326) ([kohenkatz](https://github.com/kohenkatz))
+- Border less window mode [\#324](https://github.com/cmderdev/cmder/pull/324) ([cgrail](https://github.com/cgrail))
+- Update alias.bat to show an existing alias [\#314](https://github.com/cmderdev/cmder/pull/314) ([glucas](https://github.com/glucas))
+- Add an unalias command [\#313](https://github.com/cmderdev/cmder/pull/313) ([glucas](https://github.com/glucas))
+- Revert "Add single mode support." [\#312](https://github.com/cmderdev/cmder/pull/312) ([MartiUK](https://github.com/MartiUK))
+- FIX CMDER\_ROOT for admin launch [\#311](https://github.com/cmderdev/cmder/pull/311) ([sescandell](https://github.com/sescandell))
+- Lambda color in powershell was changed to DarkGray [\#308](https://github.com/cmderdev/cmder/pull/308) ([SheGe](https://github.com/SheGe))
+- Add option to reload aliases from file [\#304](https://github.com/cmderdev/cmder/pull/304) ([glucas](https://github.com/glucas))
+- Clean aliases script [\#300](https://github.com/cmderdev/cmder/pull/300) ([melku](https://github.com/melku))
+- Adding history alias [\#299](https://github.com/cmderdev/cmder/pull/299) ([robgithub](https://github.com/robgithub))
+- Fixes the ambiguity about notice and parameter [\#298](https://github.com/cmderdev/cmder/pull/298) ([LeoColomb](https://github.com/LeoColomb))
+- Fixed small issue in README [\#296](https://github.com/cmderdev/cmder/pull/296) ([brunowego](https://github.com/brunowego))
+- Fixes small Powershell' loader issues [\#273](https://github.com/cmderdev/cmder/pull/273) ([LeoColomb](https://github.com/LeoColomb))
+- Update Dev Branch [\#272](https://github.com/cmderdev/cmder/pull/272) ([MartiUK](https://github.com/MartiUK))
+- Add custom loader for Powershell & improve its implementation [\#271](https://github.com/cmderdev/cmder/pull/271) ([LeoColomb](https://github.com/LeoColomb))
+- Add single mode support. [\#256](https://github.com/cmderdev/cmder/pull/256) ([TheCjw](https://github.com/TheCjw))
+- Revert "Start in the HOME folder." [\#253](https://github.com/cmderdev/cmder/pull/253) ([MartiUK](https://github.com/MartiUK))
+- Ensure-Exists is necessary for build.ps1, add it back. [\#249](https://github.com/cmderdev/cmder/pull/249) ([narnaud](https://github.com/narnaud))
+- Fix clink version [\#244](https://github.com/cmderdev/cmder/pull/244) ([narnaud](https://github.com/narnaud))
+- Start in the HOME folder. [\#243](https://github.com/cmderdev/cmder/pull/243) ([narnaud](https://github.com/narnaud))
+- The latest msysgit comes with vim 7.4. [\#241](https://github.com/cmderdev/cmder/pull/241) ([narnaud](https://github.com/narnaud))
+- Bump versions [\#208](https://github.com/cmderdev/cmder/pull/208) ([MartiUK](https://github.com/MartiUK))
+- New section for user help with an integration feature of Cmder. [\#199](https://github.com/cmderdev/cmder/pull/199) ([Jackbennett](https://github.com/Jackbennett))
+- Fix typos [\#198](https://github.com/cmderdev/cmder/pull/198) ([mtsk](https://github.com/mtsk))
+- Update Clink URL [\#180](https://github.com/cmderdev/cmder/pull/180) ([CoolOppo](https://github.com/CoolOppo))
+- Try to find 7-zip if it's installed before an error. [\#177](https://github.com/cmderdev/cmder/pull/177) ([Jackbennett](https://github.com/Jackbennett))
+- Update clink hyperlink [\#173](https://github.com/cmderdev/cmder/pull/173) ([gmsantos](https://github.com/gmsantos))
+- Typo fix [\#172](https://github.com/cmderdev/cmder/pull/172) ([robinbijlani](https://github.com/robinbijlani))
+- Only cd to $HOME if started in CMDER\_ROOT. [\#167](https://github.com/cmderdev/cmder/pull/167) ([schlamar](https://github.com/schlamar))
+- Find cmder files when running as Administrator. [\#166](https://github.com/cmderdev/cmder/pull/166) ([glucas](https://github.com/glucas))
+- Allow for existing HOME variable [\#165](https://github.com/cmderdev/cmder/pull/165) ([glucas](https://github.com/glucas))
+- Minor changes for \#152 [\#162](https://github.com/cmderdev/cmder/pull/162) ([Jackbennett](https://github.com/Jackbennett))
+- Add registration for right-click on folder item; Add context-menu icon [\#159](https://github.com/cmderdev/cmder/pull/159) ([kohenkatz](https://github.com/kohenkatz))
+- Getting the build script to a working state [\#157](https://github.com/cmderdev/cmder/pull/157) ([Jackbennett](https://github.com/Jackbennett))
+- Update index.html [\#145](https://github.com/cmderdev/cmder/pull/145) ([CoolOppo](https://github.com/CoolOppo))
+- Update fast new tab shortcut in gh-pages/index.html [\#131](https://github.com/cmderdev/cmder/pull/131) ([sopel](https://github.com/sopel))
+- Update links on the webpage to latest version. [\#111](https://github.com/cmderdev/cmder/pull/111) ([sc0tt](https://github.com/sc0tt))
+- Update fast new tab shortcut in README. [\#98](https://github.com/cmderdev/cmder/pull/98) ([jcheng31](https://github.com/jcheng31))
+- Make application use Cmder icon [\#88](https://github.com/cmderdev/cmder/pull/88) ([sc0tt](https://github.com/sc0tt))
+- Git exe Cleanup. [\#85](https://github.com/cmderdev/cmder/pull/85) ([MartiUK](https://github.com/MartiUK))
+- Fixed errors and grammar in README files. [\#78](https://github.com/cmderdev/cmder/pull/78) ([sicil1ano](https://github.com/sicil1ano))
+- Fixed a couple tiny typos in the readme [\#77](https://github.com/cmderdev/cmder/pull/77) ([jdsumsion](https://github.com/jdsumsion))
+- Change TERM from msys to cygwin. [\#75](https://github.com/cmderdev/cmder/pull/75) ([brkc](https://github.com/brkc))
+- Removed "C:\Users\bliker" reference in config/ConEmu.xml [\#74](https://github.com/cmderdev/cmder/pull/74) ([MartiUK](https://github.com/MartiUK))
+- Updated links on gh-pages to newer release of cmder [\#70](https://github.com/cmderdev/cmder/pull/70) ([MartiUK](https://github.com/MartiUK))
+- Add launcher [\#62](https://github.com/cmderdev/cmder/pull/62) ([austinwagner](https://github.com/austinwagner))
+- Remove wget dependency and verify existence of 7z.exe in build script [\#60](https://github.com/cmderdev/cmder/pull/60) ([austinwagner](https://github.com/austinwagner))
+- Allow use of Vim from msysgit. [\#51](https://github.com/cmderdev/cmder/pull/51) ([MartiUK](https://github.com/MartiUK))
+- Fix line ending handling if autocrlf is false. [\#34](https://github.com/cmderdev/cmder/pull/34) ([schlamar](https://github.com/schlamar))
+- Fix spelling in init.bat [\#32](https://github.com/cmderdev/cmder/pull/32) ([Shoozza](https://github.com/Shoozza))
+- Added minimal validation and usage help. [\#26](https://github.com/cmderdev/cmder/pull/26) ([Vivix](https://github.com/Vivix))
+- Fix spelling [\#22](https://github.com/cmderdev/cmder/pull/22) ([Shoozza](https://github.com/Shoozza))
+- Proofreading index.html [\#20](https://github.com/cmderdev/cmder/pull/20) ([manolomartinez](https://github.com/manolomartinez))
+- Fixed grammar [\#18](https://github.com/cmderdev/cmder/pull/18) ([tonylau](https://github.com/tonylau))
+- Fixed issue when rootDir contains spaces. [\#15](https://github.com/cmderdev/cmder/pull/15) ([jyggen](https://github.com/jyggen))
+- Another typo. Fixed link to msysgit. [\#7](https://github.com/cmderdev/cmder/pull/7) ([BeingTomGreen](https://github.com/BeingTomGreen))
+- minor typo fix [\#5](https://github.com/cmderdev/cmder/pull/5) ([BeingTomGreen](https://github.com/BeingTomGreen))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
--- a/Cmder.bat
+++ b/Cmder.bat
@ -1,3 +1,11 @@
@echo off
 SET CMDER_ROOT=%~dp0
-start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"
+
+:: Remove trailing '\'
+@if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1%
+
+if exist "%~1" (
+    start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1"
+) else (
+    start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"
+)
--- a/README.md
+++ b/README.md
@ -1,21 +1,21 @@
 # Cmder

-[![Join the chat at https://gitter.im/bliker/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cmderdev/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/cmderdev/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cmderdev/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva/branch/master?svg=true)](https://ci.appveyor.com/project/MartiUK/cmder)

-Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, adds a Monokai color scheme, integrates amazing [clink](https://github.com/mridgers/clink) and a custom prompt layout.
+Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, comes with a Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) (further enhanced by [clink-completions](https://github.com/vladimir-kotikov/clink-completions)) and a custom prompt layout.

 ![Cmder Screenshot](http://i.imgur.com/g1nNf0I.png)

 ## Why use it

-The main advantage of Cmder is portability. It is designed to be totally self-contained with no external dependencies, that is makes it great for **USB Sticks** or **cloud storage**. So you can carry your console, aliases and binaries (like wget, curl and git) with you anywhere.
+The main advantage of Cmder is portability. It is designed to be totally self-contained with no external dependencies, which makes it great for **USB Sticks** or **cloud storage**. So you can carry your console, aliases and binaries (like wget, curl and git) with you anywhere.

 ## Installation

 1. Download the [latest release](https://github.com/cmderdev/cmder/releases/)
-2. Extract
-3. (optional) Place your own executable files into the `bin` folder to be injected into your PATH.
-4. Run Cmder
+2. Extract the archive
+3. (optional) Place your own executable files into the `bin` folder to be injected into your PATH
+4. Run Cmder.exe

 ## Integration

@ -42,32 +42,119 @@ In a file explorer window right click in or on a directory to see "Cmder Here" i

 ### Shell

-* <kbd>Shift</kbd> + <kbd>Up</kbd> : Traverse up in directory structure (lovely feature!)
+* <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>U</kbd> : Traverse up in directory structure (lovely feature!)
 * <kbd>End</kbd>, <kbd>Home</kbd>, <kbd>Ctrl</kbd> : Traversing text with as usual on Windows
 * <kbd>Ctrl</kbd> + <kbd>R</kbd> : History search
 * <kbd>Shift</kbd> + Mouse : Select and copy text from buffer

-(Some shortcuts are not yet documented, thought they exist, please add them here)
+(Some shortcuts are not yet documented, though they exist - please document them here)

 ## Features

+### Access to multiple shells in one window using tabs
+You can open multiple tabs each containing one of the following shells:
+
+|Task|Shell|Description|
+|----|-----|-----------|
+|Cmder|cmd.exe|Windows 'cmd.exe' shell enhanced with Git, Git aware prompt, Clink(GNU Readline), and Aliases.|
+|Cmder as Admin|cmd.exe|Administrative Windows 'cmd.exe' Cmder shell.|
+|PowerShell|powershell.exe|Windows PowerShell enhanced with Git and Git aware prompt .|
+|PowerShell as Admin|powershell.exe|Administrative Windows 'powerhell.exe' Cmder shell.|
+|Bash|bash.exe|Unix/Linux like bash shell running on Windows.|
+|Bash as Admin|bash.exe|Administrative Unix/Linux like bash shell running on Windows.|
+|Mintty|bash.exe|Unix/Linux like bash shell running on Windows. See below for Mintty configuration differences|
+|Mintty as Admin|bash.exe|Administrative Unix/Linux like bash shell running on Windows. See below for Mintty configuration differences|
+
+Cmder, PowerShell, and Bash tabs all run on top of the Windows Console API and work as you might expect in Cmder with access to use ConEmu's color schemes, key bindings and other settings defined in the ConEmu Settings dialog.
+
+Mintty tabs use a program called 'mintty' as the terminal that is not based on the Windows Console API so some differences in functionality are normal, as a result mintty specific config is done via the '[%USERPROFILE%|$HOME]/.minttyrc' file.
+
+Mintty differs from the other tabs in that it supports xterm/xterm-256color TERM types, and does not work with ConEmu settings like color schemes and key bindings. For more on Mintty and its config click [here](https://github.com/mintty/mintty).
+
+An example of setting Cmder portable terminal colors for mintty:
+
+From a bash/mintty shell:
+
+```
+cd $CMDER_ROOT/vendor
+git clone https://github.com/karlin/mintty-colors-solarized.git
+cd mintty-colors-solarized/
+echo source \$CMDER_ROOT/vendor/mintty-colors-solarized/mintty-solarized-dark.sh>>$CMDER_ROOT/config/user-profile.sh
+```
+
+### Cmder Portable Shell User Config
+User specific configuration is possible using the cmder specific shell config files.  Edit the below files to add your own configuration:
+
+|Shell|Cmder Portable User Config|
+| ------------- |:-------------:|
+|Cmder|%CMDER_ROOT%\config\user-profile.cmd|
+|PowerShell|$ENV:CMDER_ROOT\config\user-profile.ps1|
+|Bash/Mintty|$CMDER_ROOT/config/user-profile.sh|
+
+Note: Bash and Mintty sessions will also source the '$HOME/.bashrc' file it it exists after it sources '$CMDER_ROOT/config/user-profile.sh'.
+
+### Linux like 'profile.d' support for all supported shell types.
+You can write *.cmd|*.bat, *.ps1, and *.sh scripts and just drop them in the %CMDER_ROOT%\config\profile.d folder to add startup config to Cmder.
+
+|Shell|Cmder 'Profile.d' Scripts|
+| ------------- |:-------------:|
+|Cmder|%CMDER_ROOT%\config\profile.d\\*.bat and *.cmd|
+|PowerShell|$ENV:CMDER_ROOT\config\profile.d\\*.ps1|
+|Bash/Mintty|$CMDER_ROOT/config/profile.d/*.sh|
+
+
 ### Aliases
-You can define simple aliases with command `alias name=command`.
+#### Cmder(Cmd.exe) Aliases
+You can define simple aliases for `cmd.exe` sessions with a command like `alias name=command`.  Cmd.exe aliases support optional parameters through the `$1-9` or the `$*` special characters so the alias `vi=vim.exe $*` typed as `vi [filename]` will open `[filename]` in `vim.exe`.

-For example there is one defined for you `alias e.=explorer .`
+Cmd.exe aliases can also be more complex. See: [DOSKEY.EXE documentation](http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/doskey.mspx?mfr=true) for additional details on complex aliases/macros for 'cmd.exe'

-All aliases will be saved in `/config/aliases` file
+Aliases defined using the `alias.bat` command will automatically be saved in the `%CMDER_ROOT%\config\aliases` file
+
+#### Bash.exe|Mintty.exe Aliases
+Bash shells support simple and complex aliases with optional parameters natively so they work a little different.  Typing `alias name=command` will create an alias only for the current running session.  To make an alias permanent add it to either your `$CMDER_ROOT/config/user-profile.sh` or your `$HOME/.bashrc`.
+
+If you add bash aliases to `$CMDER_ROOT/config/user-profile.sh` they will portable and follow your Cmder folder if you copy it to another machine.  `$HOME/.bashrc` defined aliases are not portable.
+
+#### PowerShell.exe Aliases
+PowerShell has native simple alias support, for example `[new-alias | set-alias] alias command`, so complex aliases with optional parameters are not supported in PowerShell sessions.  Type `get-help [new-alias|set-alias] -full` for help on PowerShell aliases.

 ### SSH Agent

 To start SSH agent simply call `start-ssh-agent`, which is in the `vendor/git-for-windows/cmd` folder.

-If you want to run SSH agent on startup, include the line `@call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd"` in `/config/user-startup.bat` (usually just uncomment it).
+If you want to run SSH agent on startup, include the line `@call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd"` in `%CMDER_ROOT%/config/user-profile.cmd` (usually just uncomment it).

-## Todo
+### Using external Cygwin/Babun, MSys2, or Git for Windows SDK with Cmder.

-1. Git Bash
-2. Check for clink and git before injecting them (Sort of done)
+1. Setup a new task by pressing '<kbd>Win</kbd> +<kbd>Alt</kbd> + <kbd>T</kbd>'.
+1. Click the '+' button to add a task.
+1. Name the new task in the top text box.
+1. Provide task parameters, this is optional.
+1. Add ```cmd /c "[path_to_external_env]\bin\bash --login -i" -new_console:d:%USERPROFILE%``` to the `Commands` text box.
+
+Recommended Optional Steps:
+
+Copy the 'vendor/cmder_exinit' file to the Cygwin/Babun, MSys2, or Git for Windows SDK environments ```/etc/profile.d/``` folder to use portable settings in the $CMDER_ROOT/config folder.
+
+Note: MinGW could work if the init scripts include profile.d but this has not been tested.
+
+The destination file extension depends on the shell you use in that environment.  For example:
+
+* bash - Copy to /etc/profile.d/cmder_exinit.sh
+* zsh  - Copy to /etc/profile.d/cmder_exinit.zsh
+
+Uncomment and edit the below line in the script to use Cmder config even when launched from outside Cmder.
+
+```
+# CMDER_ROOT=${USERPROFILE}/cmder  # This is not required if launched from Cmder.
+```
+
+## Current development branch
+
+You can download builds of the current development branch by going to AppVeyor via the following link:
+
+[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/cmderdev/cmder?svg=True)](https://ci.appveyor.com/project/MartiUK/cmder/branch/development/artifacts)

 ## License

@ -75,7 +162,7 @@ All software included is bundled with own license

 The MIT License (MIT)

-Copyright (c) 2015 Samuel Vasko
+Copyright (c) 2016 Samuel Vasko

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,60 @@
+#---------------------------------#
+#      general configuration      #
+#---------------------------------#
+
+version: 1.0.{build}-{branch}
+
+# branches to build
+branches:
+  # blacklist
+  except:
+    - gh-pages
+
+#---------------------------------#
+#    environment configuration    #
+#---------------------------------#
+
+# Operating system (build VM template)
+os: Windows Server 2012 R2
+
+#---------------------------------#
+#       build configuration       #
+#---------------------------------#
+
+build_script:
+  - ps: cd scripts; .\build.ps1 -Compile -verbose
+
+after_build:
+  - ps: .\pack.ps1 -verbose
+
+# Disable test search, since we don't have any.
+test: off
+
+#---------------------------------#
+#           artifacts             #
+#---------------------------------#
+
+artifacts:
+  - path: build\cmder.zip
+    name: cmderzip
+
+  - path: build\cmder.7z
+    name: cmder7z
+
+  - path: build\cmder_mini.zip
+    name: cmdermini
+
+  - path: build\hashes.txt
+    name: hashes
+
+#---------------------------------#
+#         notifications           #
+#---------------------------------#
+
+notifications:
+  # Webhook
+  - provider: Webhook
+    url: https://webhooks.gitter.im/e/d673abb1b2e659dcd625
+    on_build_success: true
+    on_build_failure: true
+    on_build_status_changed: true
--- a/bin/alias.bat
+++ b/bin/alias.bat
@ -1,64 +1,131 @@
@echo off

-set ALIASES=%CMDER_ROOT%\config\aliases
-setlocal
-:: handle quotes within command definition, e.g. quoted long file names
-set _x="%*"
-set _x=%_x:"=%
+
+if "%aliases%" == "" (
+  set ALIASES=%CMDER_ROOT%\config\user-aliases.cmd
+)
+
+setlocal enabledelayedexpansion
+
+if "%~1" == "" echo Use /? for help & echo. & goto :p_show

 :: check command usage
-if ["%_x%"] == [""] echo Use /? for help & echo. & goto :p_show
-if ["%1"] == ["/?"] goto:p_help
-if ["%1"] == ["/reload"] goto:p_reload
-:: /d flag for delete existing alias
-if ["%1"] == ["/d"] goto:p_del %*
-:: if arg is an existing alias, display it
-if ["%2"] == [""] (
-  doskey /macros | findstr /b %1= && goto:eof
-  echo Insufficient parameters. & goto:p_help
+
+rem #region parseargument
+goto parseargument
+
+:do_shift
+  shift
+
+:parseargument
+  set currentarg=%~1
+
+  if /i "%currentarg%" equ "/f" (
+    set aliases=%~2
+    shift
+    goto :do_shift
+  ) else if /i "%currentarg%" == "/reload" (
+    goto :p_reload
+  ) else if "%currentarg%" equ "/?" (
+    goto :p_help
+  ) else if /i "%currentarg%" equ "/d" (
+    if "%~2" neq "" (
+      if "%~3" equ "" (
+        :: /d flag for delete existing alias
+        call :p_del %~2
+        shift
+        goto :eof
+      )
+    )
+  ) else if "%currentarg%" neq "" (
+    if "%~2" equ "" (
+      :: Show the specified alias
+      doskey /macros | findstr /b %currentarg%= && exit /b
+      echo insufficient parameters.
+      goto :p_help
+    ) else (
+      :: handle quotes within command definition, e.g. quoted long file names
+      set _x=%*
+    )
+  )
+rem #endregion parseargument
+
+if "%aliases%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
+  set _x=!_x:/f %aliases% =!
+
+  if not exist "%aliases%" (
+    echo ;= @echo off>"%aliases%"
+    echo ;= rem Call DOSKEY and use this file as the macrofile>>"%aliases%"
+    echo ;= %%SystemRoot%%\system32\doskey /listsize=1000 /macrofile=%%0%%>>"%aliases%"
+    echo ;= rem In batch mode, jump to the end of the file>>"%aliases%"
+    echo ;= goto:eof>>"%aliases%"
+    echo ;= Add aliases below here>>"%aliases%"
+  )
 )

 :: validate alias
-for /f "delims== tokens=1" %%G in ("%_x%") do set alias=%%G
-set _temp=%alias: =%
+for /f "delims== tokens=1,2 usebackq" %%G in (`echo "%_x%"`) do (
+  set alias_name=%%G
+  set alias_value=%%H
+)

-if not ["%_temp%"] == ["%alias%"] (
+:: leading quotes added while validating
+set alias_name=%alias_name:~1%
+
+:: trailing quotes added while validating
+set alias_value=%alias_value:~0,-1%
+
+::remove spaces
+set _temp=%alias_name: =%
+
+if not ["%_temp%"] == ["%alias_name%"] (
 	echo Your alias name can not contain a space
 	endlocal
-	goto:eof
+	exit /b
 )

 :: replace already defined alias
-findstr /b /v /i "%alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
-echo %* >> "%ALIASES%.tmp" && type "%ALIASES%.tmp" > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
+findstr /b /v /i "%alias_name%=" "%ALIASES%" >> "%ALIASES%.tmp"
+echo %alias_name%=%alias_value% >> "%ALIASES%.tmp" && type "%ALIASES%.tmp" > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey /macrofile="%ALIASES%"
 endlocal
-goto:eof
+exit /b

 :p_del
-findstr /b /v /i "%2=" "%ALIASES%" >> "%ALIASES%.tmp"
+set del_alias=%~1
+findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
 type "%ALIASES%".tmp > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
+doskey %del_alias%=
 doskey /macrofile=%ALIASES%
 goto:eof

 :p_reload
 doskey /macrofile="%ALIASES%"
 echo Aliases reloaded
-goto:eof
+exit /b

 :p_show
-type "%ALIASES%" || echo No aliases found at "%ALIASES%"
-goto :eof
+doskey /macros|findstr /v /r "^;=" | sort
+exit /b

 :p_help
 echo.Usage:
-echo.	alias [/reload] [/d] [name=full command]
-echo.     /reload  Reload the aliases file
-echo.     /d       Delete an alias (must be followed by the alias name)
 echo. 
-echo.	If alias is called with any parameters, it will display the list of existing aliases.
+echo.	alias [options] [alias=full command]
+echo. 
+echo.Options:
+echo. 
+echo.     /d [alias]     Delete an [alias].
+echo.     /f [macrofile] Path to the [macrofile] you want to store the new alias in.
+echo.                    Default: %cmder_root%\config\user-aliases.cmd
+echo.     /reload        Reload the aliases file.  Can be used with /f argument.
+echo.                    Default: %cmder_root%\config\user-aliases.cmd
+echo.
+echo.	If alias is called with no parameters, it will display the list of existing aliases.
+echo.
 echo.	In the command, you can use the following notations:
 echo.	$* allows the alias to assume all the parameters of the supplied command.
 echo.	$1-$9 Allows you to seperate parameter by number, much like %%1 in batch.
 echo.	$T is the command seperator, allowing you to string several commands together into one alias.
 echo.	For more information, read DOSKEY/?
+exit /b
--- a/config/ConEmu.xml
+++ b/config/ConEmu.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <key name="Software">
 	<key name="ConEmu">
-		<key name=".Vanilla" modified="2015-05-17 22:10:27" build="150513">
+		<key name=".Vanilla" modified="2015-11-24 14:43:35" build="151119">
 			<value name="ColorTable00" type="dword" data="00222827"/>
 			<value name="ColorTable01" type="dword" data="009e5401"/>
 			<value name="ColorTable02" type="dword" data="0004aa74"/>
@ -72,7 +72,7 @@
 			<value name="StartType" type="hex" data="02"/>
 			<value name="CmdLine" type="string" data=""/>
 			<value name="StartTasksFile" type="string" data=""/>
-			<value name="StartTasksName" type="string" data="{cmd}"/>
+			<value name="StartTasksName" type="string" data="{cmd::Cmder}"/>
 			<value name="StartFarFolders" type="hex" data="00"/>
 			<value name="StartFarEditors" type="hex" data="00"/>
 			<value name="StoreTaskbarkTasks" type="hex" data="00"/>
@ -124,13 +124,13 @@
 			<value name="ColorKeyValue" type="dword" data="00010101"/>
 			<value name="UseCurrentSizePos" type="hex" data="01"/>
 			<value name="WindowMode" type="dword" data="0000051f"/>
-			<value name="ConWnd Width" type="dword" data="0000006f"/>
-			<value name="ConWnd Height" type="dword" data="0000001a"/>
+			<value name="ConWnd Width" type="dword" data="00000078"/>
+			<value name="ConWnd Height" type="dword" data="0000001e"/>
 			<value name="Cascaded" type="hex" data="01"/>
-			<value name="ConWnd X" type="dword" data="000003f8"/>
-			<value name="ConWnd Y" type="dword" data="00000143"/>
+			<value name="ConWnd X" type="dword" data="000001f4"/>
+			<value name="ConWnd Y" type="dword" data="000001f4"/>
 			<value name="16bit Height" type="dword" data="00000000"/>
-			<value name="AutoSaveSizePos" type="hex" data="00"/>
+			<value name="AutoSaveSizePos" type="hex" data="01"/>
 			<value name="IntegralSize" type="hex" data="00"/>
 			<value name="QuakeStyle" type="hex" data="00"/>
 			<value name="QuakeAnimation" type="dword" data="0000012c"/>
@ -483,51 +483,89 @@
 			<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-05-17 22:10:27" build="150513">
-				<value name="Count" type="dword" data="00000003"/>
-				<key name="Task1" modified="2015-05-17 22:10:27" build="150513">
-					<value name="Name" type="string" data="{cmd}"/>
-					<value name="GuiArgs" type="string" data="/icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
+			<key name="Tasks" modified="2015-11-24 14:43:35" build="151119">
+				<value name="Count" type="dword" data="00000008"/>
+				<key name="Task1" modified="2015-11-24 14:49:10" build="151119">
+					<value name="Name" type="string" data="{cmd::Cmder as Admin}"/>
+					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&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"/>
+					<value name="Flags" type="dword" data="00000000"/>
+				</key>
+				<key name="Task2" modified="2015-11-24 14:49:10" build="151119">
+					<value name="Name" type="string" data="{cmd::Cmder}"/>
+					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&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"/>
 					<value name="Flags" type="dword" data="00000000"/>
 				</key>
-				<key name="Task2" modified="2015-05-17 22:10:27" build="150513">
-					<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 -ExecutionPolicy Bypass -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 name="Task3" modified="2015-11-24 14:49:10" build="151119">
+					<value name="Name" type="string" data="{Powershell::PowerShell as Admin}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="Flags" type="dword" data="00000000"/>
-				</key>
-				<key name="Task3" modified="2015-05-17 22:10:27" build="150513">
-					<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="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
 					<value name="Cmd1" type="string" data="*PowerShell -ExecutionPolicy Bypass -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="Flags" type="dword" data="00000000"/>
 				</key>
-				<key name="Task4" modified="2015-02-24 18:49:50" build="140707">
-					<value name="Name" type="string" data="{git sh}"/>
+				<key name="Task4" modified="2015-11-24 14:49:10" build="151119">
+					<value name="Name" type="string" data="{Powershell::Powershell}"/>
 					<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\git-for-windows\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
+					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
+					<value name="Cmd1" type="string" data="PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console:d:&quot;%USERPROFILE%&quot;"/>
 					<value name="Cmd2" type="string" data="%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
+					<value name="Flags" type="dword" data="00000000"/>
+				</key>
+				<key name="Task5" modified="2015-11-24 14:49:10" build="151119">
+					<value name="Name" type="string" data="{bash::mintty as Admin}"/>
+					<value name="Flags" type="dword" data="00000000"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
+					<value name="GuiArgs" type="string" data="/icon &quot;%ConEmuDir%\..\git-for-windows\usr\share\git\git-for-windows.ico&quot;"/>
+					<value name="Cmd1" type="string" data="*%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console:d:%USERPROFILE%"/>
+					<value name="Active" type="dword" data="00000000"/>
+					<value name="Count" type="dword" data="00000001"/>
+				</key>
+				<key name="Task6" modified="2015-11-24 14:49:10" build="151119">
+					<value name="Name" type="string" data="{bash::mintty}"/>
+					<value name="Flags" type="dword" data="00000000"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
+					<value name="GuiArgs" type="string" data="/icon &quot;%ConEmuDir%\..\git-for-windows\usr\share\git\git-for-windows.ico&quot;"/>
+					<value name="Cmd1" type="string" data="%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console:d:%userProfile%"/>
+					<value name="Active" type="dword" data="00000000"/>
+					<value name="Count" type="dword" data="00000001"/>
+					<value name="Cmd2" type="string" data="%CMDER_ROOT%vendor\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console:d:%userProfile%"/>
+				</key>
+				<key name="Task7" modified="2015-11-24 14:49:10" build="151119">
+					<value name="Name" type="string" data="{bash::bash as Admin}"/>
+					<value name="Flags" type="dword" data="00000000"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
+					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
+					<value name="Active" type="dword" data="00000000"/>
+					<value name="Count" type="dword" data="00000001"/>
+					<value name="Cmd1" type="string" data="*cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
+				</key>
+				<key name="Task8" modified="2015-11-24 14:49:10" build="151119">
+					<value name="Name" type="string" data="{bash::bash}"/>
+					<value name="Flags" type="dword" data="00000000"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
+					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
+					<value name="Cmd1" type="string" data="cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
+					<value name="Active" type="dword" data="00000000"/>
+					<value name="Count" type="dword" data="00000001"/>
 				</key>
 			</key>

-			<key name="Apps" modified="2015-05-17 22:10:27" build="150513">
+			<key name="Apps" modified="2015-11-24 14:49:10" build="151119">
 				<value name="Count" type="dword" data="00000000"/>
 			</key>
-			<key name="Colors" modified="2015-05-17 22:10:27" build="150513">
-				<key name="Palette1" modified="2015-05-17 22:10:27" build="150513">
+			<key name="Colors" modified="2015-11-24 14:49:10" build="151119">
+				<key name="Palette1" modified="2015-11-24 14:49:10" build="151119">
 					<value name="Name" type="string" data="Monokai"/>
 					<value name="ExtendColors" type="hex" data="00"/>
 					<value name="ExtendColorIdx" type="hex" data="0e"/>
@ -628,7 +666,7 @@
 			<value name="StatusBar.Hide.Dpi" type="hex" data="01"/>
 			<value name="TabFlashChanged" type="dword" data="00000008"/>
 			<value name="TabModifiedSuffix" type="string" data="[*]"/>
-			<key name="HotKeys" modified="2015-05-17 22:10:27" build="150513">
+			<key name="HotKeys" modified="2015-11-24 14:43:35" build="151119">
 				<value name="KeyMacroVersion" type="hex" data="02"/>
 				<value name="Multi.Modifier" type="dword" data="00000011"/>
 				<value name="Multi.ArrowsModifier" type="dword" data="0000005b"/>
@ -734,27 +772,27 @@
 				<value name="PastePathKey" type="dword" data="00101144"/>
 				<value name="PasteCygwinKey" type="dword" data="00005d2d"/>
 				<value name="KeyMacro01" type="dword" data="00a01231"/>
-				<value name="KeyMacro01.Text" type="string" data="Task(&quot;cmd&quot;)"/>
+				<value name="KeyMacro01.Text" type="string" data="Task(1)"/>
 				<value name="KeyMacro02" type="dword" data="00a01232"/>
-				<value name="KeyMacro02.Text" type="string" data="Task(&quot;PowerShell&quot;)"/>
+				<value name="KeyMacro02.Text" type="string" data="Task(2)"/>
 				<value name="KeyMacro03" type="dword" data="000011d0"/>
 				<value name="KeyMacro03.Text" type="string" data="FontSetSize(1,2)"/>
 				<value name="KeyMacro04" type="dword" data="000011d1"/>
 				<value name="KeyMacro04.Text" type="string" data="FontSetSize(1,-2)"/>
 				<value name="KeyMacro05" type="dword" data="00a01233"/>
-				<value name="KeyMacro05.Text" type="string" data="Task(&quot;PowerShell as Admin&quot;)"/>
-				<value name="KeyMacro06" type="dword" data="00000000"/>
-				<value name="KeyMacro06.Text" type="string" data=""/>
-				<value name="KeyMacro07" type="dword" data="00000000"/>
-				<value name="KeyMacro07.Text" type="string" data=""/>
-				<value name="KeyMacro08" type="dword" data="00000000"/>
-				<value name="KeyMacro08.Text" type="string" data=""/>
-				<value name="KeyMacro09" type="dword" data="00000000"/>
-				<value name="KeyMacro09.Text" type="string" data=""/>
-				<value name="KeyMacro10" type="dword" data="00000000"/>
-				<value name="KeyMacro10.Text" type="string" data=""/>
-				<value name="KeyMacro11" type="dword" data="00000000"/>
-				<value name="KeyMacro11.Text" type="string" data=""/>
+				<value name="KeyMacro05.Text" type="string" data="Task(3)"/>
+				<value name="KeyMacro06" type="dword" data="00a01234"/>
+				<value name="KeyMacro06.Text" type="string" data="Task(4)"/>
+				<value name="KeyMacro07" type="dword" data="00a01235"/>
+				<value name="KeyMacro07.Text" type="string" data="Task(5)"/>
+				<value name="KeyMacro08" type="dword" data="00a01236"/>
+				<value name="KeyMacro08.Text" type="string" data="Task(6)"/>
+				<value name="KeyMacro09" type="dword" data="00a01237"/>
+				<value name="KeyMacro09.Text" type="string" data="Task(7)"/>
+				<value name="KeyMacro10" type="dword" data="00a01238"/>
+				<value name="KeyMacro10.Text" type="string" data="Task(8)"/>
+				<value name="KeyMacro11" type="dword" data="00a01239"/>
+				<value name="KeyMacro11.Text" type="string" data="Task(9)"/>
 				<value name="KeyMacro12" type="dword" data="00000000"/>
 				<value name="KeyMacro12.Text" type="string" data=""/>
 				<value name="KeyMacro13" type="dword" data="00000000"/>
@ -805,7 +843,20 @@
 				<value name="DndLKey" type="hex" data="00"/>
 				<value name="DndRKey" type="hex" data="a2"/>
 				<value name="WndDragKey" type="dword" data="00121101"/>
+				<value name="Multi.Unfasten" type="dword" data="00000000"/>
+				<value name="Key.DebugProcess" type="dword" data="00105b44"/>
+				<value name="Key.DumpProcess" type="dword" data="00000000"/>
+				<value name="Key.DumpTree" type="dword" data="00000000"/>
 			</key>
+			<value name="StartCreateDelay" type="dword" data="00000064"/>
+			<value name="DefaultTerminalDebugLog" type="hex" data="00"/>
+			<value name="LastMonitor" type="string" data="0,0,1920,1020"/>
+			<value name="Restore2ActiveMon" type="hex" data="00"/>
+			<value name="DownShowExOnTopMessage" type="hex" data="00"/>
+			<value name="EnvironmentSet" type="multi"/>
+			<value name="Update.InetTool" type="hex" data="00"/>
+			<value name="Update.InetToolCmd" type="string" data=""/>
+			<value name="SuppressBells" type="hex" data="01"/>
 		</key>
 	</key>
 </key>
--- a/config/Readme.md
+++ b/config/Readme.md
@ -1,3 +1,14 @@
 ## Config

-All config files must be in this folder. If there is no option to set this folder directly, it has to be hardlinked.
+All config files must be in this folder. If there is no option to set this folder 
+directly, it has to be hardlinked.
+
+* `aliases`: aliases in cmd; called form vendor\init.bat; autocreated from
+  `vendor\aliases.example`.
+* `*.lua`: clink completitions and prompt filters; called from vendor\cmder.lua after all
+  other prompt filter and clink completitons are initialized; add your own.
+* `user_profile.{sh|bat|ps1}`: startup files for bash|cmd|powershell tasks; called from their
+  respective startup scripts in `vendor\`; autocreated on first start of such a task
+* `.history`: the current commandline history; autoupdated on close
+* `settings`: settings for readline; overwritten on update
+* `ConEmu.xml`: settings from ConEmu (=the UI of cmder -> Preferences); overwritten on update
--- a/config/aliases
+++ b/config/aliases
@ -1,7 +0,0 @@
-e.=explorer .
-gl=git log --oneline --all --graph --decorate  $*
-ls=ls --show-control-chars -F --color $*
-pwd=cd
-clear=cls
-history=cat %CMDER_ROOT%\config\.history
-unalias=alias /d $1
--- a/config/settings
+++ b/config/settings
@ -1,43 +0,0 @@
-# name: Ctrl-D exits
-# type: bool
-# Ctrl-D exits the process when it is pressed on an empty line.
-ctrld_exits = 1
-
-# name: Ctrl-C raises exception
-# type: bool
-# When Ctrl-C is pressed Clink will pass it thourgh to the parent by raising the
-# appropriate exception.
-passthrough_ctrlc = 1
-
-# name: Esc clears line
-# type: bool
-# Clink clears the current line when Esc is pressed (unless Readline's Vi mode
-# is enabled).
-esc_clears_line = 1
-
-# name: Match display colour
-# type: int
-# Colour to use when displaying matches. A value less than 0 will be the
-# opposite brightness of the default colour.
-match_colour = -1
-
-# name: Executable match style
-# type: enum
-# Changes how Clink will match executables when there is no path separator on
-# the line. 0 = PATH only, 1 = PATH and CWD, 2 = PATH, CWD, and directories. In
-# all cases both executables and directories are matched when there is a path
-# separator present.
-exec_match_style = 2
-
-# name: Prompt colour
-# type: int
-# Surrounds the prompt in ANSI escape codes to set the prompt's colour. Disabled
-# when the value is less than 0.
-prompt_colour = -1
-
-# name: Auto-answer terminate prompt
-# type: enum
-# Automatically answers cmd.exe's 'Terminate batch job (Y/N)?' prompts. 0 =
-# disabled, 1 = answer 'Y', 2 = answer 'N'.
-terminate_autoanswer = 0
-
--- a/icons/cmder_blue.ico
+++ b/icons/cmder_blue.ico
--- a/icons/cmder_green.ico
+++ b/icons/cmder_green.ico
--- a/icons/cmder_icon.psd
+++ b/icons/cmder_icon.psd
--- a/icons/cmder_orange.ico
+++ b/icons/cmder_orange.ico
--- a/icons/cmder_purple.ico
+++ b/icons/cmder_purple.ico
--- a/icons/cmder_red.ico
+++ b/icons/cmder_red.ico
--- a/icons/cmder_yellow.ico
+++ b/icons/cmder_yellow.ico
--- a/icons/icon_16_blue.png
+++ b/icons/icon_16_blue.png
--- a/icons/icon_16_green.png
+++ b/icons/icon_16_green.png
--- a/icons/icon_16_orange.png
+++ b/icons/icon_16_orange.png
--- a/icons/icon_16_purple.png
+++ b/icons/icon_16_purple.png
--- a/icons/icon_16_red.png
+++ b/icons/icon_16_red.png
--- a/icons/icon_16_yellow.png
+++ b/icons/icon_16_yellow.png
--- a/icons/icon_256_blue.png
+++ b/icons/icon_256_blue.png
--- a/icons/icon_256_green.png
+++ b/icons/icon_256_green.png
--- a/icons/icon_256_orange.png
+++ b/icons/icon_256_orange.png
--- a/icons/icon_256_purple.png
+++ b/icons/icon_256_purple.png
--- a/icons/icon_256_red.png
+++ b/icons/icon_256_red.png
--- a/icons/icon_256_yellow.png
+++ b/icons/icon_256_yellow.png
--- a/icons/icon_32_blue.png
+++ b/icons/icon_32_blue.png
--- a/icons/icon_32_green.png
+++ b/icons/icon_32_green.png
--- a/icons/icon_32_orange.png
+++ b/icons/icon_32_orange.png
--- a/icons/icon_32_purple.png
+++ b/icons/icon_32_purple.png
--- a/icons/icon_32_red.png
+++ b/icons/icon_32_red.png
--- a/icons/icon_32_yellow.png
+++ b/icons/icon_32_yellow.png
--- a/icons/icon_48_blue.png
+++ b/icons/icon_48_blue.png
--- a/icons/icon_48_green.png
+++ b/icons/icon_48_green.png
--- a/icons/icon_48_orange.png
+++ b/icons/icon_48_orange.png
--- a/icons/icon_48_purple.png
+++ b/icons/icon_48_purple.png
--- a/icons/icon_48_red.png
+++ b/icons/icon_48_red.png
--- a/icons/icon_48_yellow.png
+++ b/icons/icon_48_yellow.png
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@ -4,6 +4,7 @@
 #include "resource.h"
 #include <vector>

+
 #pragma comment(lib, "Shlwapi.lib")

 #ifndef UNICODE
@ -63,10 +64,12 @@ optpair GetOption()

 	if (argc == 1)
 	{
+		// no commandline argument...
 		pair = optpair(L"/START", L"");
 	}
 	else if (argc == 2 && argv[1][0] != L'/')
 	{
+		// only a single argument: this should be a path...
 		pair = optpair(L"/START", argv[1]);
 	}
 	else
@ -113,9 +116,29 @@ void StartCmder(std::wstring path, bool is_single_mode)
 	PathRemoveFileSpec(exeDir);

 	PathCombine(icoPath, exeDir, L"icons\\cmder.ico");
-	PathCombine(oldCfgPath, exeDir, L"config\\ConEmu.xml");
-	PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml");
-	PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe");
+
+	// Check for machine-specific config file.
+	PathCombine(oldCfgPath, exeDir, L"config\\ConEmu-%COMPUTERNAME%.xml");
+	ExpandEnvironmentStrings(oldCfgPath, oldCfgPath, sizeof(oldCfgPath) / sizeof(oldCfgPath[0]));
+	if (!PathFileExists(oldCfgPath)) {
+		PathCombine(oldCfgPath, exeDir, L"config\\ConEmu.xml");
+	}
+
+	// Check for machine-specific config file.
+	PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu-%COMPUTERNAME%.xml");
+	ExpandEnvironmentStrings(cfgPath, cfgPath, sizeof(cfgPath) / sizeof(cfgPath[0]));
+	if (!PathFileExists(cfgPath)) {
+		PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml");
+	}
+
+	SYSTEM_INFO sysInfo;
+	GetNativeSystemInfo(&sysInfo);
+	if (sysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) {
+		PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu64.exe");
+	}
+	else {
+		PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe");
+	}

 	if (FileExists(oldCfgPath) && !FileExists(cfgPath))
 	{
@ -139,7 +162,15 @@ void StartCmder(std::wstring path, bool is_single_mode)
 	}

 	SetEnvironmentVariable(L"CMDER_ROOT", exeDir);
-	SetEnvironmentVariable(L"CMDER_START", path.c_str());
+	if (!streqi(path.c_str(), L""))
+	{
+		if (!SetEnvironmentVariable(L"CMDER_START", path.c_str())) {
+			MessageBox(NULL, _T("Error trying to set CMDER_START to given path!"), _T("Error"), MB_OK);
+		}
+	}
+	// Ensure EnvironmentVariables are propagated.
+	SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG, 5000, NULL);
+	SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM) L"Environment", SMTO_ABORTIFHUNG, 5000, NULL); // For Windows >= 8

 	STARTUPINFO si = { 0 };
 	si.cb = sizeof(STARTUPINFO);
@ -149,8 +180,10 @@ void StartCmder(std::wstring path, bool is_single_mode)
 #endif

 	PROCESS_INFORMATION pi;
-
-	CreateProcess(conEmuPath, args, NULL, NULL, false, 0, NULL, NULL, &si, &pi);
+	if (!CreateProcess(conEmuPath, args, NULL, NULL, false, 0, NULL, NULL, &si, &pi)) {
+		MessageBox(NULL, _T("Unable to create the ConEmu Process!"), _T("Error"), MB_OK);
+		return;
+	}
 }

 bool IsUserOnly(std::wstring opt)
--- a/12
+++ b/12
@ -4,6 +4,18 @@ launcher
 .git
 *.rb
 build
+scripts
 config\.history
 packignore
+icons\Thumbs.db
+icons\cmder_icon.psd
+icons\icon_16*.png
+icons\icon_32*.png
+icons\icon_48*.png
+icons\icon_256*.png
 Cmder.bat
+vendor\tmp
+appveyor.yml
+vendor\cmder.sh
+vendor\git-prompt.sh
+config\user-*
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@ -13,9 +13,9 @@

    Executes the default build for Cmder; Conemu, clink. This is equivalent to the "minimum" style package in the releases
 .EXAMPLE
-    .\build.ps1 -Full
+    .\build.ps1 -Compile

-    Executes a full build for Cmder, including git. This is equivalent to the "full" style package in the releases
+    Recompile the launcher executable if you have the requisite build tools for C++ installed.
 .EXAMPLE
    .\build -verbose

@ -29,7 +29,7 @@
    Samuel Vasko, Jack Bennett
    Part of the Cmder project.
 .LINK
-    https://github.com/bliker/cmder - Project Home
+    http://cmder.net/ - Project Home
 #>
 [CmdletBinding(SupportsShouldProcess=$true)]
 Param(
@ -49,11 +49,16 @@ Param(
    # Config folder location
    [string]$config = "..\config",

-    # Include git with the package build
-    [switch]$Full
+    # New launcher if you have MSBuild tools installed
+    [switch]$Compile
 )

-. "$PSScriptRoot\utils.ps1"
+# Get the scripts and cmder root dirs we are building in.
+$ScriptRoot = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition
+$cmder_root = $ScriptRoot.replace("\scripts","")
+
+# Dot source util functions into this scope
+. ".\utils.ps1"
 $ErrorActionPreference = "Stop"

 Push-Location -Path $saveTo
@ -74,12 +79,16 @@ if ($config -ne "") {
    } else { $ConEmuXml = "" }
 } else { $ConEmuXml = "" }

+# Kill ssh-agent.exe if it is running from the $env:cmder_root we are building
+foreach ($ssh_agent in $(get-process ssh-agent -erroraction silentlycontinue)) {
+  if ([string]$($ssh_agent.path) -match [string]$cmder_root.replace('\','\\')) {
+    write-verbose $("Stopping " + $ssh_agent.path + "!")
+    stop-process $ssh_agent.id
+  }
+}

+$vend = $pwd
 foreach ($s in $sources) {
-    if($Full -eq $false -and $s.name -eq "git-for-windows"){
-        Continue
-    }
-
    Write-Verbose "Getting $($s.name) from URL $($s.url)"

    # We do not care about the extensions/type of archive
@ -87,7 +96,7 @@ foreach ($s in $sources) {
    Delete-Existing $tempArchive
    Delete-Existing $s.name

-    Invoke-WebRequest -Uri $s.url -OutFile $tempArchive -ErrorAction Stop
+    Download-File -Url $s.url -File $vend\$tempArchive -ErrorAction Stop
    Extract-Archive $tempArchive $s.name

    if ((Get-Childitem $s.name).Count -eq 1) {
@ -105,8 +114,29 @@ if ($ConEmuXml -ne "") {

 Pop-Location

-Push-Location -Path $launcher
-msbuild CmderLauncher.vcxproj /p:configuration=Release
-Pop-Location
+if($Compile) {
+    Push-Location -Path $launcher
+    msbuild CmderLauncher.vcxproj /p:configuration=Release
+    if ($LastExitCode -ne 0) {
+        throw "msbuild failed to build the executable."
+    }
+    Pop-Location
+} else {
+    Write-Warning "You are not building a launcher, Use -Compile"
+    Write-Warning "This cannot be a release. Test build only!"
+}
+
+# Put vendor\cmder.sh in /etc/profile.d so it runs when we start bash or mintty
+if ( (Test-Path $($SaveTo + "git-for-windows/etc/profile.d") ) ) {
+  write-verbose "Adding cmder.sh /etc/profile.d"
+  Copy-Item $($SaveTo + "cmder.sh") $($SaveTo + "git-for-windows/etc/profile.d/cmder.sh")
+}
+
+# Replace /etc/profile.d/git-prompt.sh with cmder lambda prompt so it runs when we start bash or mintty
+if ( !(Test-Path $($SaveTo + "git-for-windows/etc/profile.d/git-prompt.sh.bak") ) ) {
+  write-verbose "Replacing /etc/profile.d/git-prompt.sh with our git-prompt.sh"
+  Move-Item $($SaveTo + "git-for-windows/etc/profile.d/git-prompt.sh") $($SaveTo + "git-for-windows/etc/profile.d/git-prompt.sh.bak")
+  Copy-Item $($SaveTo + "git-prompt.sh") $($SaveTo + "git-for-windows/etc/profile.d/git-prompt.sh")
+}

 Write-Verbose "All good and done!"
--- a/scripts/pack.ps1
+++ b/scripts/pack.ps1
@ -19,7 +19,7 @@
    Samuel Vasko, Jack Bennett, Martin Kemp
    Part of the Cmder project.
 .LINK
-    https://github.com/bliker/cmder - Project Home
+    https://github.com/cmderdev/cmder - Project Home
 #>

 [CmdletBinding(SupportsShouldProcess=$true)]
@ -46,6 +46,7 @@ $targets = @{
 }

 Delete-Existing "..\Version*"
+Delete-Existing "..\build\*"

 $version = Invoke-Expression "git describe --abbrev=0 --tags"
 (New-Item -ItemType file "$cmderRoot\Version $version") | Out-Null
--- a/scripts/utils.ps1
+++ b/scripts/utils.ps1
@ -28,7 +28,8 @@ function Delete-Existing ($path) {
 }

 function Extract-Archive ($source, $target) {
-    Invoke-Expression "7z x -y -o$($target) '$source' > `$null"
+    Write-Verbose $("Extracting Archive '$cmder_root\vendor\" + $source.replace('/','\') + " to '$cmder_root\vendor\$target'")
+    Invoke-Expression "7z x -y -o`"$($target)`" `"$source`"  > `$null"
    if ($lastexitcode -ne 0) {
        Write-Error "Extracting of $source failied"
    }
@ -79,13 +80,54 @@ function Register-Cmder(){
    )
    Begin
    {
-        New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
+        New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT > $null
    }
    Process
    {
-        New-Item -Path "HKCR:\Directory\Shell\Cmder" -Force -Value $MenuText
+        New-Item         -Path "HKCR:\Directory\Shell\Cmder" -Force -Value $MenuText
        New-ItemProperty -Path "HKCR:\Directory\Shell\Cmder" -Force -Name "Icon" -Value `"$icon`"
        New-ItemProperty -Path "HKCR:\Directory\Shell\Cmder" -Force -Name "NoWorkingDirectory"
-        New-Item -Path "HKCR:\Directory\Shell\Cmder\Command" -Force -Value "`"$PathToExe`" `"$Command`" "
+        New-Item         -Path "HKCR:\Directory\Shell\Cmder\Command" -Force -Value "`"$PathToExe`" `"$Command`" "
+
+        New-Item         -Path "HKCR:\Directory\Background\Shell\Cmder" -Force -Value $MenuText
+        New-ItemProperty -Path "HKCR:\Directory\Background\Shell\Cmder" -Force -Name "Icon" -Value `"$icon`"
+        New-ItemProperty -Path "HKCR:\Directory\Background\Shell\Cmder" -Force -Name "NoWorkingDirectory"
+        New-Item         -Path "HKCR:\Directory\Background\Shell\Cmder\Command" -Force -Value "`"$PathToExe`" `"$Command`" "
+    }
+    End
+    {
+        Remove-PSDrive -Name HKCR
    }
 }
+
+function Unregister-Cmder{
+    Begin
+    {
+        New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT > $null
+    }
+    Process
+    {
+        Remove-Item -Path "HKCR:\Directory\Shell\Cmder" -Recurse
+        Remove-Item -Path "HKCR:\Directory\Background\Shell\Cmder" -Recurse
+    }
+    End
+    {
+        Remove-PSDrive -Name HKCR
+    }
+}
+
+function Download-File {
+    param (
+        $Url,
+        $File
+    )
+    # I think this is the problem
+    $File = $File -Replace "/", "\"
+    Write-Verbose "Downloading from $Url to $File"
+    $wc = new-object System.Net.WebClient
+    if ($env:https_proxy) {
+      $wc.proxy = (new-object System.Net.WebProxy($env:https_proxy))
+    }
+    $wc.Proxy.Credentials=[System.Net.CredentialCache]::DefaultNetworkCredentials;
+    $wc.DownloadFile($Url, $File)
+}
--- a/vendor/clink.lua
+++ b/vendor/clink.lua
@ -1,5 +1,51 @@
-function lambda_prompt_filter()
-    clink.prompt.value = string.gsub(clink.prompt.value, "{lamb}", "λ")
+-- default script for clink, called by init.bat when injecting clink
+
+-- !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
+-- !!! Use "%CMDER_ROOT%\config\<whatever>.lua" to add your lua startup scripts
+
+
+-- At first, load the original clink.lua file
+-- this is needed as we set the script path to this dir and therefore the original 
+-- clink.lua is not loaded.
+local clink_lua_file = clink.get_env('CMDER_ROOT')..'\\vendor\\clink\\clink.lua'
+dofile(clink_lua_file)
+
+-- now add our own things...
+
+---
+ -- Setting the prompt in clink means that commands which rewrite the prompt do
+ -- not destroy our own prompt. It also means that started cmds (or batch files
+ -- which echo) don't get the ugly '{lamb}' shown.
+---
+function set_prompt_filter()
+    -- get_cwd() is differently encoded than the clink.prompt.value, so everything other than
+    -- pure ASCII will get garbled. So try to parse the current directory from the original prompt
+    -- and only if that doesn't work, use get_cwd() directly.
+    -- The matching relies on the default prompt which ends in X:\PATH\PATH>
+    -- (no network path possible here!)
+    local old_prompt = clink.prompt.value
+    local cwd = old_prompt:match('.*(.:[^>]*)>')
+    if cwd == nil then cwd = clink.get_cwd() end
+    
+    -- environment systems like pythons virtualenv change the PROMPT and usually
+    -- set some variable. But the variables are differently named and we would never
+    -- get them all, so try to parse the env name out of the PROMPT.
+    -- envs are usually put in round or square parentheses and before the old prompt
+    local env = old_prompt:match('.*%(([^%)]+)%).+:')
+    -- also check for square brackets
+    if env == nil then env = old_prompt:match('.*%[([^%]]+)%].+:') end
+    
+    -- build our own prompt
+    -- orig: $E[1;32;40m$P$S{git}{hg}$S$_$E[1;30;40m{lamb}$S$E[0m
+    -- color codes: "\x1b[1;37;40m"
+    local cmder_prompt = "\x1b[1;32;40m{cwd} {git}{hg} \n\x1b[1;30;40m{lamb} \x1b[0m"
+    cmder_prompt = string.gsub(cmder_prompt, "{cwd}", cwd)
+    if env == nil then
+        lambda = "λ"
+    else
+        lambda = "("..env..") λ"
+    end
+    clink.prompt.value = string.gsub(cmder_prompt, "{lamb}", lambda)
 end

 ---
@ -57,8 +103,45 @@ local function get_hg_dir(path)
    return get_dir_contains(path, '.hg')
 end

+-- adapted from from clink-completions' git.lua
 local function get_git_dir(path)
-    return get_dir_contains(path, '.git')
+
+    -- return parent path for specified entry (either file or directory)
+    local function pathname(path)
+        local prefix = ""
+        local i = path:find("[\\/:][^\\/:]*$")
+        if i then
+            prefix = path:sub(1, i-1)
+        end
+        return prefix
+    end
+
+    -- Checks if provided directory contains git directory
+    local function has_git_dir(dir)
+        return #clink.find_dirs(dir..'/.git') > 0 and dir..'/.git'
+    end
+
+    local function has_git_file(dir)
+        local gitfile = io.open(dir..'/.git')
+        if not gitfile then return false end
+
+        local git_dir = gitfile:read():match('gitdir: (.*)')
+        gitfile:close()
+
+        return git_dir and dir..'/'..git_dir
+    end
+
+    -- Set default path to current directory
+    if not path or path == '.' then path = clink.get_cwd() end
+
+    -- Calculate parent path now otherwise we won't be
+    -- able to do that inside of logical operator
+    local parent_path = pathname(path)
+
+    return has_git_dir(path)
+        or has_git_file(path)
+        -- Otherwise go up one level and make a recursive call
+        or (parent_path ~= path and get_git_dir(parent_path) or nil)
 end

 ---
@ -81,8 +164,8 @@ end
 -- @return {bool}
 ---
 function get_hg_status()
-    for line in io.popen("hg status"):lines() do
-        return false
+    for line in io.popen("hg status -0"):lines() do
+       return false
    end
    return true
 end
@ -118,17 +201,23 @@ end

 ---
 -- Find out current branch
- -- @return {false|git branch name}
+ -- @return {nil|git branch name}
 ---
-function get_git_branch()
-    for line in io.popen("git branch 2>nul"):lines() do
-        local m = line:match("%* (.+)$")
-        if m then
-            return m
-        end
-    end
+function get_git_branch(git_dir)
+    local git_dir = git_dir or get_git_dir()

-    return false
+    -- If git directory not found then we're probably outside of repo
+    -- or something went wrong. The same is when head_file is nil
+    local head_file = git_dir and io.open(git_dir..'/HEAD')
+    if not head_file then return end
+
+    local HEAD = head_file:read()
+    head_file:close()
+
+    -- if HEAD matches branch expression, then we're on named branch
+    -- otherwise it is a detached commit
+    local branch_name = HEAD:match('ref: refs/heads/(.+)')
+    return branch_name or 'HEAD detached at '..HEAD:sub(1, 7)
 end

 ---
@ -136,7 +225,10 @@ end
 -- @return {bool}
 ---
 function get_git_status()
-    return os.execute("git diff --quiet --ignore-submodules HEAD 2>nul")
+    for line in io.popen("git status --porcelain 2>nul"):lines() do
+        return false
+    end
+    return true
 end

 function git_prompt_filter()
@ -147,9 +239,10 @@ function git_prompt_filter()
        dirty = "\x1b[31;1m",
    }

-    if get_git_dir() then
+    local git_dir = get_git_dir()
+    if git_dir then
        -- if we're inside of git repo then try to detect current branch
-        local branch = get_git_branch()
+        local branch = get_git_branch(git_dir)
        if branch then
            -- Has branch => therefore it is a git folder, now figure out status
            if get_git_status() then
@ -168,7 +261,8 @@ function git_prompt_filter()
    return false
 end

-clink.prompt.register_filter(lambda_prompt_filter, 40)
+-- insert the set_prompt at the very beginning so that it runs first
+clink.prompt.register_filter(set_prompt_filter, 1)
 clink.prompt.register_filter(hg_prompt_filter, 50)
 clink.prompt.register_filter(git_prompt_filter, 50)

@ -182,3 +276,4 @@ for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
        dofile(filename)
    end
 end
+
--- a/vendor/cmder.sh
+++ b/vendor/cmder.sh
@ -0,0 +1,73 @@
+# DO NOT EDIT THIS FILE IT WILL BE OVERWRITTEN ON UPDATE
+#
+# Add portable user customizations ${CMDER_ROOT}/config/user-profile.sh,
+# these customizations will follow Cmder if $CMDER_ROOT is copied
+# to another machine.
+#
+# Add system specific users customizations to $HOME/.bashrc, these 
+# customizations will not follow Cmder to another machine.
+
+# We do this for bash as admin sessions since $CMDER_ROOT is not being set
+if [ "$CMDER_ROOT" == "" ] ; then
+    case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac
+else
+    case "$CMDER_ROOT" in *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";; esac
+fi
+
+# Remove any trailing '/'
+CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::')
+
+export CMDER_ROOT
+
+if [ -d "/c/Program Files/Git" ] ; then
+    GIT_INSTALL_ROOT="/c/Program Files/Git"
+elif [ -d "/c/Program Files(x86)/Git" ] ; then
+    GIT_INSTALL_ROOT="/c/Program Files(x86)/Git"
+elif [ -d "${CMDER_ROOT}/vendor/git-for-windows" ] ; then
+    GIT_INSTALL_ROOT=${CMDER_ROOT}/vendor/git-for-windows
+fi
+
+if [[ ! "$PATH" =~ "${GIT_INSTALL_ROOT}/bin:" ]] ; then
+  PATH=${GIT_INSTALL_ROOT}/bin:$PATH
+fi
+
+PATH=${CMDER_ROOT}/bin:$PATH:${CMDER_ROOT}
+
+export PATH
+
+# Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
+# to source them at startup.
+if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
+  mkdir -p ${CMDER_ROOT}/config/profile.d
+fi
+
+if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
+  unset profile_d_scripts
+  pushd ${CMDER_ROOT}/config/profile.d >/dev/null
+  profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null)
+
+  if [ ! "x${profile_d_scripts}" = "x" ] ; then
+    for x in ${profile_d_scripts} ; do
+      # echo Sourcing "${x}"...
+      . $x
+    done
+  fi
+  popd >/dev/null
+fi
+
+if [ -f ${CMDER_ROOT}/config/user-profile.sh ] ; then
+    . ${CMDER_ROOT}/config/user-profile.sh
+else
+    echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
+    cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"
+# use this file to run your own startup commands for msys2 bash'
+
+# To add a new vendor to the path, do something like:
+# export PATH=\${CMDER_ROOT}/vendor/whatever:\${PATH}
+eof
+fi
+
+# Source the users .bashrc file if it exists
+if [ -f "${HOME}/.bashrc" ] ; then
+    . "${HOME}/.bashrc"
+fi
--- a/vendor/cmder_exinit
+++ b/vendor/cmder_exinit
@ -0,0 +1,86 @@
+# Copy this file to your non integrated *nix-like environment, 
+# Cygwin/MSys2/Git for Windows SDK, installs '/etc/profile.d/'
+# folder to integrate the externally installed Unix like environment
+# into Cmder so it has access to settings stored in Cmder/config
+# folder when launched.
+#
+# The destination file extension depends on the shell you use.  For example:
+#
+# bash - Copy to /etc/profile.d/cmder_exinit.sh
+# zsh  - Copy to /etc/profile.d/cmder_exinit.zsh
+# Add portable user customizations ${CMDER_ROOT}/config/user-profile.sh or
+# add whole config scripts to ${CMDER_ROOT}/config/profile.d both will be sourced
+# from mthis file and be appied to the environment at startup.
+#
+# These customizations will follow Cmder if $CMDER_ROOT is copied
+# to another machine.
+#
+# Add system specific users customizations to $HOME/.bashrc, these 
+# customizations will not follow Cmder to another machine.
+
+# # Uncomment and edit the CMDER_ROOT line to use Cmder/config even when launched
+# # from outside Cmder.
+# CMDER_ROOT=${USERPROFILE}/cmder  # This is not required if launched from Cmder.
+
+# Check that we haven't already been sourced.
+[[ -z ${CMDER_EXINIT} ]] && CMDER_EXINIT="1" || return
+
+# We do this for bash as admin sessions since $CMDER_ROOT is not being set
+if [ "$CMDER_ROOT" = "" -a "$ConEmuDir" != "" ] ; then
+  if [ -d "${ConEmuDir}../../vendor" ] ; then
+    case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac
+  else
+    echo "Running in ConEmu without Cmder, skipping Cmder integration."
+  fi
+elif [ "$CMDER_ROOT" != "" ] ; then
+  case "$CMDER_ROOT" in *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";; esac
+fi
+
+if [ ! "$CMDER_ROOT" = "" ] ; then
+  # Remove any trailing '/'
+  CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::')
+  
+  echo "Using \"CMDER_ROOT\" at \"${CMDER_ROOT}\"."
+  
+  export CMDER_ROOT
+  
+  PATH=${CMDER_ROOT}/bin:$PATH:${CMDER_ROOT}
+   
+  export PATH
+  
+  # Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
+  # to source them at startup.
+  if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
+    mkdir -p ${CMDER_ROOT}/config/profile.d
+  fi
+  
+  if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
+    unset profile_d_scripts
+    pushd ${CMDER_ROOT}/config/profile.d >/dev/null
+    if [ ! "x${ZSH_VERSION}" = "x"  ]; then
+      profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.zsh 2>/dev/null)
+    elif [ ! "x${BASH_VERSION}" = "x"  ]; then
+      profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null)
+    fi
+  
+    if [ ! "x${profile_d_scripts}" = "x" ] ; then
+      for x in ${profile_d_scripts} ; do
+        # echo Sourcing "${x}"...
+        . $x
+      done
+    fi
+    popd >/dev/null
+  fi
+  
+  if [ -f ${CMDER_ROOT}/config/user-profile.sh ] ; then
+    . ${CMDER_ROOT}/config/user-profile.sh
+  else
+    echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
+    cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"
+# use this file to run your own startup commands for msys2 bash'
+
+# To add a new vendor to the path, do something like:
+# export PATH=\${CMDER_ROOT}/vendor/whatever:\${PATH}
+eof
+  fi
+fi
--- a/vendor/git-prompt.sh
+++ b/vendor/git-prompt.sh
@ -0,0 +1,22 @@
+PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
+PS1="$PS1"'\[\033[32m\]'       # change to green
+PS1="$PS1"'\u@\h '             # user@host<space>
+PS1="$PS1"'\[\033[33m\]'       # change to brownish yellow
+PS1="$PS1"'\w'                 # current working directory
+if test -z "$WINELOADERNOEXEC"
+then
+	GIT_EXEC_PATH="$(git --exec-path 2>/dev/null)"
+	COMPLETION_PATH="${GIT_EXEC_PATH%/libexec/git-core}"
+	COMPLETION_PATH="${COMPLETION_PATH%/lib/git-core}"
+	COMPLETION_PATH="$COMPLETION_PATH/share/git/completion"
+	if test -f "$COMPLETION_PATH/git-prompt.sh"
+	then
+		. "$COMPLETION_PATH/git-completion.bash"
+		. "$COMPLETION_PATH/git-prompt.sh"
+		PS1="$PS1"'\[\033[36m\]'  # change color to cyan
+		PS1="$PS1"'`__git_ps1`'   # bash function
+	fi
+fi
+PS1="$PS1"'\[\033[0m\]'        # change color
+PS1="$PS1"'\n'                 # new line
+PS1="$PS1"'λ '                 # prompt: always λ 
--- a/vendor/init.bat
+++ b/vendor/init.bat
@ -1,79 +1,189 @@
+@echo off
+
 :: Init Script for cmd.exe
-:: Sets some nice defaults
 :: Created as part of cmder project

 :: !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
-:: !!! Use "%CMDER_ROOT%\config\user-startup.cmd" to add your own startup commands
+:: !!! Use "%CMDER_ROOT%\config\user-profile.cmd" to add your own startup commands
+
+:: Set to > 0 for verbose output to aid in debugging.
+if not defined verbose-output ( set verbose-output=0 )

 :: Find root dir
-@if not defined CMDER_ROOT (
-    for /f "delims=" %%i in ("%ConEmuDir%\..\..") do @set CMDER_ROOT=%%~fi
+if not defined CMDER_ROOT (
+    for /f "delims=" %%i in ("%ConEmuDir%\..\..") do set "CMDER_ROOT=%%~fi"
 )

-:: Change the prompt style
-:: Mmm tasty lamb
-@prompt $E[1;32;40m$P$S{git}{hg}$S$_$E[1;30;40m{lamb}$S$E[0m
+:: Remove trailing '\'
+if "%CMDER_ROOT:~-1%" == "\" SET "CMDER_ROOT=%CMDER_ROOT:~0,-1%"

 :: Pick right version of clink
-@if "%PROCESSOR_ARCHITECTURE%"=="x86" (
+if "%PROCESSOR_ARCHITECTURE%"=="x86" (
    set architecture=86
 ) else (
    set architecture=64
 )

+:: Tell the user about the clink config files...
+if not exist "%CMDER_ROOT%\config\settings" (
+    echo Generating clink initial settings in "%CMDER_ROOT%\config\settings"
+    echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup.
+)
+
 :: Run clink
-@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config"
+"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"

 :: Prepare for git-for-windows

 :: I do not even know, copypasted from their .bat
-@set PLINK_PROTOCOL=ssh
-@if not defined TERM set TERM=cygwin
+set PLINK_PROTOCOL=ssh
+if not defined TERM set TERM=cygwin

-:: Check if msysgit is installed
-@if exist "%ProgramFiles%\Git" (
-    set "GIT_INSTALL_ROOT=%ProgramFiles%\Git"
-) else if exist "%ProgramFiles(x86)%\Git" (
-    set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git"
-) else if exist "%CMDER_ROOT%\vendor" (
-    set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
+:: The idea:
+:: * if the users points as to a specific git, use that
+:: * test if a git is in path and if yes, use that
+:: * last, use our vendored git
+:: also check that we have a recent enough version of git (e.g. test for GIT\cmd\git.exe)
+if defined GIT_INSTALL_ROOT (
+    if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" (goto :FOUND_GIT)
 )

+:: check if git is in path...
+setlocal enabledelayedexpansion
+for /F "delims=" %%F in ('where git.exe 2^>nul') do @(
+    pushd %%~dpF
+    cd ..
+    set "test_dir=!CD!"
+    popd
+    if exist "!test_dir!\cmd\git.exe" (
+        set "GIT_INSTALL_ROOT=!test_dir!"
+        set test_dir=
+        goto :FOUND_GIT
+    ) else (
+        echo Found old git version in "!test_dir!", but not using...
+        set test_dir=
+    )
+)
+
+:: our last hope: our own git...
+:VENDORED_GIT
+if exist "%CMDER_ROOT%\vendor\git-for-windows" (
+    set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
+    call :verbose-output Add the minimal git commands to the front of the path
+    set "PATH=!GIT_INSTALL_ROOT!\cmd;%PATH%"
+) else (
+    goto :NO_GIT
+)
+
+:FOUND_GIT
 :: Add git to the path
-@if defined GIT_INSTALL_ROOT (
-    set "PATH=%GIT_INSTALL_ROOT%\bin;%GIT_INSTALL_ROOT%\usr\bin;%GIT_INSTALL_ROOT%\share\vim\vim74;%PATH%"
+if defined GIT_INSTALL_ROOT (
+    rem add the unix commands at the end to not shadow windows commands like more
+    call :verbose-output Enhancing PATH with unix commands from git in "%GIT_INSTALL_ROOT%\usr\bin"
+    set "PATH=%PATH%;%GIT_INSTALL_ROOT%\usr\bin;%GIT_INSTALL_ROOT%\usr\share\vim\vim74"
    :: define SVN_SSH so we can use git svn with ssh svn repositories
    if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"
 )

+:NO_GIT
+endlocal & set "PATH=%PATH%" & set "SVN_SSH=%SVN_SSH%" & set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
+
 :: Enhance Path
-@set PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%
+set "PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%\"

-:: Add aliases
-@doskey /macrofile="%CMDER_ROOT%\config\aliases"
+:: Drop *.bat and *.cmd files into "%CMDER_ROOT%\config\profile.d"
+:: to run them at startup.
+if not exist "%CMDER_ROOT%\config\profile.d" (
+  mkdir "%CMDER_ROOT%\config\profile.d"
+)

-:: Set home path
-@if not defined HOME set HOME=%USERPROFILE%
+pushd "%CMDER_ROOT%\config\profile.d"
+for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
+  call :verbose-output Calling "%CMDER_ROOT%\config\profile.d\%%x"...
+  call "%CMDER_ROOT%\config\profile.d\%%x"
+)
+popd

-@if defined CMDER_START (
-    @cd /d "%CMDER_START%"
+:: Allows user to override default aliases store using profile.d
+:: scripts run above by setting the 'aliases' env variable.
+::
+:: Note: If overriding default aliases store file the aliases
+:: must also be self executing, see '.\user-aliases.cmd.example',
+:: and be in profile.d folder.
+set "user-aliases=%CMDER_ROOT%\config\user-aliases.cmd"
+
+:: The aliases environment variable is used by alias.bat to id
+:: the default file to store new aliases in.
+if not defined aliases (
+  set "aliases=%user-aliases%"
+)
+
+:: Make sure we have a self-extracting user-aliases.cmd file
+setlocal enabledelayedexpansion
+if not exist "%user-aliases%" (
+    echo Creating intial user-aliases store in "%user-aliases%"...
+    copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
 ) else (
-    @if "%CD%\" == "%CMDER_ROOT%" (
-        @cd /d "%HOME%"
+    type "%user-aliases%" | findstr /i ";= Add aliases below here" >nul
+    if "!errorlevel!" == "1" (
+        echo Creating intial user-aliases store in "%user-aliases%"...
+        copy "%CMDER_ROOT%\%user-aliases%" "%user-aliases%.old_format" 
+        copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%" 
    )
 )

-@if exist "%CMDER_ROOT%\config\user-startup.cmd" (
-    @rem create this file and place your own command in there
-    call "%CMDER_ROOT%\config\user-startup.cmd"
-) else (
-    @echo Creating user startup file: "%CMDER_ROOT%\config\user-startup.cmd"
-    (
-    @echo :: use this file to run your own startup commands 
-    @echo :: use @ in front of the command to prevent printing the command
-    @echo. 
-    @echo :: @call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd
-    @echo :: @set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%
-    @echo. 
-    ) > "%CMDER_ROOT%\config\user-startup.cmd"
+:: Update old 'user-aliases' to new self executing 'user-aliases.cmd'
+if exist "%CMDER_ROOT%\config\aliases" (
+  echo Updating old "%CMDER_ROOT%\config\aliases" to new format...
+  type "%CMDER_ROOT%\config\aliases" >> "%user-aliases%" && del "%CMDER_ROOT%\config\aliases"
+) else if exist "%user-aliases%.old_format" (
+  echo Updating old "%user-aliases%" to new format...
+  type "%user-aliases%.old_format" >> "%user-aliases%" && del "%user-aliases%.old_format"
 )
+endlocal
+:: Add aliases to the environment
+call "%user-aliases%"
+
+:: See vendor\git-for-windows\README.portable for why we do this
+:: Basically we need to execute this post-install.bat because we are
+:: manually extracting the archive rather than executing the 7z sfx
+if exist "%CMDER_ROOT%\vendor\git-for-windows\post-install.bat" (
+    call :verbose-output Running Git for Windows one time Post Install....
+    cd /d "%CMDER_ROOT%\vendor\git-for-windows\"
+    "%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe" --no-needs-console --hide --no-cd --command=post-install.bat
+    cd /d %USERPROFILE%
+)
+
+:: Set home path
+if not defined HOME set "HOME=%USERPROFILE%"
+
+:: This is either a env variable set by the user or the result of
+:: cmder.exe setting this variable due to a commandline argument or a "cmder here"
+if defined CMDER_START (
+    cd /d "%CMDER_START%"
+)
+
+
+if exist "%CMDER_ROOT%\config\user-profile.cmd" (
+    REM Create this file and place your own command in there
+    call "%CMDER_ROOT%\config\user-profile.cmd"
+) else (
+    echo Creating user startup file: "%CMDER_ROOT%\config\user-profile.cmd"
+    (
+    echo :: use this file to run your own startup commands
+    echo :: use  in front of the command to prevent printing the command
+    echo.
+    echo :: call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd"
+    echo :: set "PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%"
+    echo.
+    ) > "%CMDER_ROOT%\config\user-profile.cmd"
+)
+
+exit /b
+
+::
+:: sub-routines below here
+::
+:verbose-output
+    if %verbose-output% gtr 0 echo %*
+    exit /b
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@ -1,4 +1,18 @@
-# Compatibility with PS major versions <= 2
+# Init Script for PowerShell
+# Created as part of cmder project
+
+# !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
+# !!! Use "%CMDER_ROOT%\config\user-profile.ps1" to add your own startup commands
+
+# We do this for Powershell as Admin Sessions because CMDER_ROOT is not beng set.
+if (! $ENV:CMDER_ROOT ) {
+    $ENV:CMDER_ROOT = resolve-path( $ENV:ConEmuDir + "\..\.." )
+}
+
+# Remove trailing '\'
+$ENV:CMDER_ROOT = (($ENV:CMDER_ROOT).trimend("\"))
+
+# Compatibility with PS major versions <= 2
 if(!$PSScriptRoot) {
    $PSScriptRoot = Split-Path $Script:MyInvocation.MyCommand.Path
 }
@ -10,11 +24,26 @@ if( -not $env:PSModulePath.Contains($CmderModulePath) ){
    $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
 }

+try {
+    Get-command -Name "vim" -ErrorAction Stop >$null
+} catch {
+    # # You could do this but it may be a little drastic and introduce a lot of
+    # # unix tool overlap with powershel unix like aliases
+    # $env:Path += $(";" + $env:CMDER_ROOT + "\vendor\git-for-windows\usr\bin")
+    # set-alias -name "vi" -value "vim"
+    # # I think the below is safer.
+
+    new-alias -name "vim" -value $($ENV:CMDER_ROOT + "\vendor\git-for-windows\usr\bin\vim.exe")
+    new-alias -name "vi" -value vim
+}
+
 try {
    # Check if git is on PATH, i.e. Git already installed on system
    Get-command -Name "git" -ErrorAction Stop >$null
 } catch {
-    $env:Path += ";$env:CMDER_ROOT\vendor\git-for-windows\bin"
+    $env:Path += $(";" + $env:CMDER_ROOT + "\vendor\git-for-windows\cmd")
+    # for bash.exe, which in the cmd version is found as <GIT>\usr\bin\bash.exe
+    $env:Path += $(";" + $env:CMDER_ROOT + "\vendor\git-for-windows\bin")
 }

 try {
@ -26,7 +55,7 @@ try {
 }

 function checkGit($Path) {
-    if (Test-Path -Path (Join-Path $Path '.git/') ) {
+    if (Test-Path -Path (Join-Path $Path '.git') ) {
        Write-VcsStatus
        return
    }
@ -55,11 +84,37 @@ if ($gitStatus) {
 }

 # Move to the wanted location
-if (Test-Path Env:\CMDER_START) {
-    Set-Location -Path $Env:CMDER_START
-} elseif ($Env:CMDER_ROOT -and $Env:CMDER_ROOT.StartsWith($pwd)) {
-    Set-Location -Path $Env:USERPROFILE
+# This is either a env variable set by the user or the result of
+# cmder.exe setting this variable due to a commandline argument or a "cmder here"
+if ( $ENV:CMDER_START ) {
+    Set-Location -Path "$ENV:CMDER_START"
+}
+
+if (Get-Module PSReadline -ErrorAction "SilentlyContinue") {
+    Set-PSReadlineOption -ExtraPromptLineCount 1
 }

 # Enhance Path
 $env:Path = "$Env:CMDER_ROOT\bin;$env:Path;$Env:CMDER_ROOT"
+
+# Drop *.ps1 files into "$ENV:CMDER_ROOT\config\profile.d"
+# to source them at startup.
+if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
+  mkdir "$ENV:CMDER_ROOT\config\profile.d"
+}
+
+pushd $ENV:CMDER_ROOT\config\profile.d
+foreach ($x in ls *.ps1) {
+  # write-host write-host Sourcing $x
+  . $x
+}
+popd
+
+$CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config\user-profile.ps1"
+if(Test-Path $CmderUserProfilePath) {
+    # Create this file and place your own command in there.
+    . "$CmderUserProfilePath"
+} else {
+    Write-Host "Creating user startup file: $CmderUserProfilePath"
+    "# Use this file to run your own startup commands" | Out-File $CmderUserProfilePath
+}
--- a/vendor/sources.json
+++ b/vendor/sources.json
@ -1,22 +1,22 @@
 [
    {
        "name": "git-for-windows",
-        "version": "v2.6.1.windows.1",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.6.1.windows.1/PortableGit-2.6.1-32-bit.7z.exe"
+        "version": "v2.9.3.windows.1",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.9.3.windows.1/PortableGit-2.9.3-32-bit.7z.exe"
    },
    {
        "name": "clink",
-        "version": "0.4.5",
-        "url": "https://github.com/mridgers/clink/releases/download/0.4.5/clink_0.4.5.zip"
+        "version": "0.4.8",
+        "url": "https://github.com/mridgers/clink/releases/download/0.4.8/clink_0.4.8.zip"
    },
    {
        "name": "conemu-maximus5",
-        "version": "150913",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.09.13/ConEmuPack.150913.7z"
+        "version": "160710",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v16.07.10/ConEmuPack.160710.7z"
    },
    {
        "name": "clink-completions",
-        "version": "0.2.0",
-        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.2.0.zip"
+        "version": "0.3.1",
+        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.1.zip"
    }
 ]
--- a/vendor/user-aliases.cmd.example
+++ b/vendor/user-aliases.cmd.example
@ -0,0 +1,15 @@
+;= @echo off
+;= rem Call DOSKEY and use this file as the macrofile
+;= %SystemRoot%\system32\doskey /listsize=1000 /macrofile=%0%
+;= rem In batch mode, jump to the end of the file
+;= goto:eof
+;= Add aliases below here
+e.=explorer .
+gl=git log --oneline --all --graph --decorate  $*
+ls=ls --show-control-chars -F --color $*
+pwd=cd
+clear=cls
+history=cat %CMDER_ROOT%\config\.history
+unalias=alias /d $1
+vi=vim $*
+cmderr=cd /d "%CMDER_ROOT%"