85804d729e
Merge pull request #734 from chase-miller/development
...
Added check for git install path in init.bat.
2015-11-24 22:43:15 +00:00
4154cdf204
Do not overwrite aliases on update
2015-11-24 23:38:26 +01:00
76e14cd268
Added check for %USERPROFILE%\AppData\Local\Programs\Git path in init.bat. Installing from https://git-scm.com/download/win seems to put git in this directory.
2015-11-24 17:26:41 -05:00
8601b0f940
added config/user-* to packignore
2015-11-24 16:06:39 -06:00
ce2a311c81
Merge branch 'development' of https://github.com/cmderdev/cmder into fix_icons
2015-11-24 14:54:40 -06:00
191316282a
Get 100% supported Cmder task icons from icons\Cmder.ico so tabs have an ico if launched from the cmder.bat file
2015-11-24 14:52:13 -06:00
fd9c8a74b1
Added Git for Windows icon to mintty tasks to differentiate them from 100% supported Cmder tasks
2015-11-24 14:45:52 -06:00
519b9cabbb
Merge pull request #729 from daxgames/fix_vim_alias
...
Fixed - Powershell vim/vim alias opening a new tab when editing a file
2015-11-24 18:21:03 +01:00
9b25544c05
Fixed - Powershell vim/vim alias opening a new tab when editin a file
2015-11-24 10:58:58 -06:00
a9b06459da
Merge pull request #726 from daxgames/default_aliases
...
Added vi/vim aliases and fixed powershell startup errors
2015-11-24 09:26:02 +00:00
5eff672a4b
Added lambda prompt for bash/mintty, matches cmder and powershell prompts
2015-11-23 22:13:33 -06:00
8566b6f6ca
Added vi/vim aliases and fixed powershell startup errors
2015-11-23 19:10:22 -05:00
1af65edaec
Merge pull request #702 from daxgames/msys_bash
...
Msys bash
2015-11-23 23:31:02 +00:00
e6d2394d48
Added some documentation to the README.md file
2015-11-23 18:20:15 -05:00
6d215f58c6
Merge pull request #673 from DoCode/development
...
Enable the '/single' switch (#577 )
2015-11-20 10:50:44 +00:00
7e4912514f
Merge pull request #722 from MartiUK/development
...
Update to conemu 151119
2015-11-20 10:50:02 +00:00
86edf3cbb0
Merge master into release-1.3
...
Resolved Conflicts:
.gitignore
README.md
2015-11-20 10:45:33 +00:00
a3e2d7546d
Update to ConEmu 151119
...
Changelog: https://conemu.github.io/blog/2015/11/19/Build-151119.html
2015-11-20 10:29:32 +00:00
b9362b0a3d
For PSV2.0 compat don't use $PSScriptRoot
...
As the build script must be executed from the `<projectroot>/scripts`
directory anyway we can assume `util.ps1` is as the same path as
`build.ps1` and just reference the current folder.
2015-11-19 14:18:47 +00:00
1046198648
Merge pull request #720 from MartiUK/development
...
Disable appveyor test search
2015-11-19 14:04:46 +00:00
908773622d
Disable appveyor test search
...
We don't have tests.
2015-11-19 13:57:12 +00:00
deb23a21a1
Merge pull request #719 from MartiUK/development
...
Fix gitter webhook
2015-11-18 14:16:53 +00:00
1ec507c1d0
Fix gitter webhook
...
Should notify gitter of build success and failures.
2015-11-18 14:10:26 +00:00
1b159df7c2
Merge pull request #718 from MartiUK/development
...
Publish appveyor artefacts
2015-11-18 13:15:14 +00:00
2e582b9db9
Fix after_build script.
...
We are already in the scripts directory after build.
This prevents the ItemNotFoundException seen here:
https://ci.appveyor.com/project/MartiUK/cmder/build/1.0.79-development#64
2015-11-18 13:08:31 +00:00
f9b2c768b8
Package and upload artefacts on appveyor
...
Useful for PRs and releases.
2015-11-18 13:01:57 +00:00
4ce55d1019
Merge remote-tracking branch 'refs/remotes/cmderdev/development' into development
2015-11-18 12:06:10 +00:00
7f43014b68
pulled in upstream development branch
2015-11-14 12:15:42 -06:00
cf15dcffc7
Added/enhanced bash with cmder.sh/user-cmder.sh, organized tasks menu
...
added personal files to .gitignore so they never get uploaded to the repo and added support for msys2 bash in the new git for windows
added autocreate of config/user-cmder.sh if iot does not exist and added it to the .gitignore
Added tasks: cmd::Cmder, cmd::Cmder as Admin, bash::bash, bash::bash as Admin, bash::mintty, bash::mintty as admin, powershell::powershell, powershell::powershell as Admin. Set default task to cmd::Cmder. Cot rid of init.bat running before /bin/bash, fixes double exit requirement
Added running git for windows post-install.bat on first cmder launch
fixed file/path not found errors when launching powershell as admin
fixed file/path not found errors when launching bash/mintty as admin
fixed PATH in vendor/cmder.sh
Added sourcing ~/.bashrc if it exists.
changed .gitignore to ignore anything with path of config/user-*
removed my personal files from .gitignore, left in config/user-*
Make sure $CMDER_ROOT does not have a trailing '/'
%CMDER_ROOT% does not have trailing '\'. allow user to specify a conemu.xml on the command line
Removed '\' from %CMDER_ROOT%
2015-11-14 12:07:56 -06:00
10d0431242
Merge pull request #698 from daxgames/fix_batch_files
...
Fix batch files
2015-11-14 18:35:30 +01:00
eb5ab51573
Removed training '\' from %CMDER_ROOT% and added config/user-* to .gitignore
2015-11-14 11:14:14 -06:00
87bc4178e6
fix vim path in powershell profile
2015-11-12 15:18:21 +01:00
85aaa09d97
Merge pull request #705 from wenzowski/patch-1
...
add bundled vim to path
2015-11-12 13:52:53 +01:00
3a2d986c36
⬆️ Git@v2.6.3.windows.1
...
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.6.3.windows.1
2015-11-12 13:28:34 +01:00
37626e7687
⬆️ ConEmu@151109
...
Changelog: http://conemu.github.io/blog/2015/11/09/Build-151109.html
We skipped http://conemu.github.io/blog/2015/11/01/Build-151101.html for no reason btw.
2015-11-12 13:25:49 +01:00
b018f2cc50
add bundled vim to path
2015-11-11 23:28:04 -05:00
ffd61db30e
Merge pull request #697 from vladimir-kotikov/patch-2
...
Speed up git prompt filtering
2015-11-07 01:06:36 +01:00
53e03076da
Speed up git prompt filtering
...
This increases performance of git prompt filter by fetching branch name directly from `.git/HEAD` file instead of spawning `git` process. Apart from increasing performance this may also solve potential problems with `git` output, as reported in https://github.com/cmderdev/cmder/issues/692
2015-11-07 02:44:43 +03:00
6e3b83460c
Merge remote-tracking branch 'upstream/development' into development
2015-10-31 16:29:10 -06:00
3657795b35
Don't package the appveyor file
2015-10-27 07:24:19 +01:00
df37981707
⬆️ ConEmu@v15.10.25
...
Changelog: http://conemu.github.io/blog/2015/10/25/Build-151025.html
2015-10-27 07:12:21 +01:00
669bc8bfa6
Update Readme
2015-10-25 03:00:37 +01:00
c2823af661
Merge pull request #676 from vladimir-kotikov/patch-1
...
Upgrade clink-completions to 0.2.1
2015-10-22 16:28:12 +01:00
66a75ce0dc
⬆️ Bump clink-completions to 0.2.1
2015-10-21 23:19:19 +03:00
15013369cb
⬆️ ConEmu@151015
...
Changelogs:
https://conemu.github.io/blog/2015/10/06/Build-151006.html
https://conemu.github.io/blog/2015/10/15/Build-151015.html
2015-10-21 21:24:42 +02:00
50c5742794
⬆️ Git@2.6.2.windows.1
2015-10-21 21:21:54 +02:00
a57c11e171
Enable the '/single' switch by using the registry as statemachine for the current location ('CMDER_START')
...
Fixed issue #577
2015-10-20 16:49:08 +02:00
417051f496
Fix alt text on gitter link too
2015-10-16 13:35:34 +01:00
0f6441a7ee
Update README.md
...
Update Gitter badge
2015-10-16 13:34:36 +01:00
5e07567a72
Pre-set tasks for the 9 number keys
...
Task macros ready for users who want to configure their own extra tasks
2015-10-16 13:09:58 +01:00
