5feccb3c7c
added backup of ConEmu.xml to ./config/user-ConEmu.xml at cmder launch if it exists
2016-10-02 23:00:00 -05:00
abd7db99b6
added backup of ConEmu.xml to ./config folder at cmder launch if it exists
2016-10-02 22:16:22 -05:00
66c6d5bbb3
added ability to have a user-ConEmu.xml file in addition to the computer specific and default ConEmu.xml files
2016-10-02 21:50:56 -05:00
af586d5410
add use-ConEmu.xml
2016-10-02 18:34:40 -05:00
c8adf424e2
Added closing process in get_git_status ( #1 )
...
After execution command: git add * git continues to operate without closing. The process does not stop.
2016-09-27 22:59:09 +02:00
d144cd0fc2
⬆️ Update ConEmu to 160914 (stable)
...
Changelog: https://conemu.github.io/blog/2016/09/14/Build-160914.html
2016-09-17 22:49:23 +02:00
bb312ad74b
try --no-lock-index for Git
2016-09-17 22:48:02 +02:00
df7beff2ef
⬆️ Update ConEmu to 160828 (stable)
...
Changelog: https://conemu.github.io/blog/2016/08/28/Build-160828.html
2016-09-03 10:52:17 +02:00
b7bfe72303
⬆️ Update Git to v2.10.0
...
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.0.windows.1
2016-09-03 10:50:34 +02:00
490fae770c
⬆️ Update Git to v2.9.3 (2)
...
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.9.3.windows.2
2016-08-25 21:51:17 +02:00
a6817faae6
Merge pull request #1082 from nverno/patch-1
...
Update Readme.md
2016-08-25 21:11:36 +02:00
a8450eb1d3
Update Readme.md
...
just minor typos
2016-08-25 03:00:31 -04:00
355df7a48a
Merge pull request #1078 from orionlee/fix_bash_login_when_cmder_root_has_spaces
...
Fix bash login when $CMDER_ROOT has spaces
2016-08-21 20:23:20 +02:00
5354b5f80f
Further fix bash login when ${CMDER_ROOT} has spaces.
...
Inspecting the script uncovers similar problems elsewhere
not encountered in my initial testing. They are fixed accordingly.
2016-08-20 16:01:46 -07:00
d095d6afd6
Fix bash login when ${CMDER_ROOT} has spaces.
...
E.g., if ${CMDER_ROOT} is /c/Users/Foo Bar/cmder,
the following errors will occur:
bash: pushd: /c/Users/Foo: No such file or directory
bash: [: /c/Users/Foo: binary operator expected
bash: /c/Users/Foo: No such file or directory
2016-08-20 15:56:49 -07:00
832c1991e4
Merge pull request #1070 from janschulz/unicode_path_prompt
...
Parse the original prompt for cwd and env names
2016-08-15 16:40:35 +02:00
19672aafff
⬆️ Update Git to v2.9.2
...
Release notes: https://github.com/git-for-windows/git/tree/v2.9.3.windows.1
2016-08-14 04:59:27 +02:00
6b10771312
Parse the original prompt for cwd and env names
...
clink.get_cwd() is returning a string which is differently encoded than what
clink.prompt.value expects. This results in garbled path names if the path
condains non-ASCII chars. The (arguable hacky) solution is to parse the old
prompt for the current directory (which breaks if the user sets a PROMPT env var
which is incompatible to the regex used here...).
Also parse out a environment name set by systems like virtualenv or conda: this
could be done more specifically by targeting each such system and using the
usually set environment variable but this would mean that we would have to do
that for each and every such system out there and that is probably not a sane
idea...
2016-08-09 13:45:36 +02:00
13fd41eb82
change how we ask hg for the status
...
closes #1035
Thanks @raleighr3
2016-07-30 00:36:32 +02:00
07fb26c4a5
Merge pull request #1042 from daxgames/kill_ssh_agent
...
Added kill ssh-agent to build.ps1
2016-07-18 01:47:45 +02:00
13c474b768
added kill ssh-agent to build.ps1
2016-07-17 18:28:38 -05:00
f2641e4cd2
⬆️ Update Git to v2.9.2
2016-07-17 01:09:06 +02:00
6a0ea28d22
add .github_changelog_generator to .gitignore
2016-07-14 10:51:01 +02:00
04c7bb7da8
update changelog
2016-07-14 09:52:27 +02:00
317834316a
add hashes.txt to artifacts
2016-07-14 09:28:13 +02:00
4e90303511
⬆️ Update ConEmu to 160710 (stable)
...
Changelog: https://conemu.github.io/blog/2016/07/10/Build-160710.html
2016-07-14 09:19:01 +02:00
0379dc1d0d
Merge pull request #1037 from cmderdev/development
...
Development into Master
2016-07-14 07:54:42 +02:00
393d7d19c5
⬆️ Update clink to 0.4.8
2016-07-14 07:53:13 +02:00
aa87425910
Update README.md
2016-07-04 12:34:07 +02:00
688c2f7721
Merge pull request #1016 from Mansuro/patch-2
...
Minor update in README.md
2016-07-04 12:33:03 +02:00
1b711f1f29
Minor update in README.md
...
Updated the keyboard shortcut to traverse up a directory structure has been changed
2016-07-04 12:31:28 +02:00
65014b1ce4
Update README.md
2016-07-03 02:57:46 +02:00
af1a4c9061
Update README.md
2016-07-03 02:44:40 +02:00
5f83cb3c64
Merge pull request #1014 from JoshuaKGoldberg/development
...
Added rainbow icons
2016-06-30 23:54:10 +02:00
9a3eab9bf8
Added rainbow icons
2016-06-30 09:04:29 -07:00
1dddbcff05
Revert "Fix missing "\" when building dirpath to psmodules"
...
This reverts commit 6978bb7417
2016-06-30 11:41:17 +02:00
924ab12aeb
we don't need a second function for that.
2016-06-30 02:53:00 +02:00
6a474dd624
make launcher run ConEmu64 on 64-bit Windows
...
It will now run ConEmu64.exe on 64-bit Windows and ConEmu.exe on 32-bit Windows.
fixes #191
2016-06-30 01:55:13 +02:00
14a6e5953c
Merge pull request #1011 from MoFo88/git_branch_colouring
...
Fix git branch colouring
2016-06-28 18:37:34 +02:00
9c0ad9fd81
Fix git branch name colouring
...
Colouring fixed when there are some changes in a branch
2016-06-28 14:13:35 +02:00
84d44b18f2
Merge pull request #961 from janschulz/prompt-in-clink
...
cmd: change the prompt in lua
2016-06-21 23:10:59 +02:00
a542f4e20c
cmd: change the prompt in lua
...
This keeps the PROMPT variable as is and changes the prompt to the cmder style
in the clink code.
This has two advantages:
* opening a cmd in a cmder session will now show the old prompt code instead of
a ugly raw prompt without the replacements. This led to ugly output when a
batch file echoed their content (e.g `conda build recipe/`).
* when a command rewrites the prompt (e.g. an activate in a virtualenv), these
command sometimes simply overwrites the PROMPT so that the cmder enhancements
were not anymore in place. Now we simply don't care and overwrite it with our
stuff in the clink part. This might mean that a user has to install a lua
script so that e.g. conda environments are visible on the prompt.
2016-06-21 13:33:49 +02:00
e5611af7be
Update README.md
...
change badge style
2016-06-15 22:58:45 +02:00
999b5af29a
⬆️ Update ConEmu to 160612 (stable)
...
Changelog: https://conemu.github.io/blog/2016/06/12/Build-160612.html
2016-06-14 18:21:40 +02:00
87210ae7ca
⬆️ Git to 2.9.0
...
Changelog: https://github.com/git-for-windows/git/tree/v2.9.0.windows.1
2016-06-14 17:34:19 +02:00
75deb4f945
Merge pull request #992 from vladimir-kotikov/patch-5
...
Bump clink-completions to 0.3.1
2016-06-11 00:15:18 +02:00
6a080a1284
Bump clink-completions to 0.3.1
2016-06-11 01:07:47 +03:00
d014d785b0
⬆️ Update to Git to 2.8.4
2016-06-09 00:18:56 +02:00
346680b52e
Merge pull request #974 from janschulz/fix_gitbranch
...
Fix git branch name never shown as dirty
2016-06-02 20:14:15 +02:00
c19412045c
Fix git branch name never shown as dirty
...
The problem was that io.popen() returns a file and not the return code of the
called program.
The new code was inspired by
http://stackoverflow.com/a/14031974/1380673
2016-06-02 12:45:07 +02:00
