Commit Graph

749 Commits

Author SHA1 Message Date
05db3658ad Merge pull request #2738 from DRSDavidSoft/patch-3
Related to #2654: Move space from "{git}{hg}{svn}" to individual parts
2022-09-08 22:31:55 -04:00
ef0de62d82 Merge pull request #2742 from daxgames/better_bat
Better bat
2022-09-04 09:25:03 -04:00
59bbdaddc7 Cleanup 2022-09-04 09:16:39 -04:00
7a9ad78e66 Fix #2740 2022-09-01 13:00:43 +00:00
ec371bafff Update Clink, Clink Completions and ConEmu dependencies 2022-08-30 22:10:12 +04:30
a617397aea move space from "{git}{hg}{svn}" to individual parts 2022-08-30 21:59:09 +04:30
dceccffb72 Merge branch 'master' into CH 2022-07-15 10:06:59 -04:00
0a4d3bcb77 update Clink and Git 2022-07-15 10:04:30 -04:00
70b5822fd5 Enable asynchronous clink prompt update for svn status
If enabled in the cmder prompt config, use clink asynchronous update of the prompt for svn status (similar to git)
2022-05-25 15:34:22 +02:00
f184714457 Add new cmder config value
Add new setting value prompt_overrideSvnStatusOptIn to cmder_prompt_config.lua.default to control of asynchronous svn status update should be used with clink
2022-05-25 15:28:29 +02:00
62bfbb4501 Update Git for Windows to 2.36.0 2022-04-25 16:49:28 -05:00
8bf40227e8 Update Clink to 1.3.16 2022-04-25 16:47:34 -05:00
427937918e update Clink to 1.3.15 2022-04-16 13:41:01 -04:00
fe29497878 update Clink to 1.3.14 2022-04-16 13:36:24 -04:00
ef51ed2be2 Merge branch 'fix_find_git' of https://github.com/daxgames/cmder into fix_find_git 2022-04-16 11:35:41 -04:00
6d313853f3 only look at \cmd\git.exe for found git 2022-04-16 11:35:19 -04:00
f46e8b81d8 Merge branch 'master' into fix_find_git 2022-04-16 11:18:38 -04:00
ce02fb4a0e fix find latest git 2022-04-16 10:51:26 -04:00
e345f187d8 Remove set term=cygwin in init.bat (#2688) 2022-04-16 15:01:17 +01:00
6189f4f0e6 fix prompt branch for git worktree 2022-03-17 07:57:48 -04:00
0616ff0a82 Merge pull request #2660 from vsajip/fix-2659
Fix #2659: Use get_hg_branch() to get Mercurial branch information.
2022-02-03 17:48:26 -05:00
4098265a36 Fix #2654: blank space added between {cwd} and version_control variable 2022-02-02 14:13:51 +01:00
eab4454ac5 Fix #2659: Use get_hg_branch() to get Mercurial branch information. 2022-01-29 14:48:58 +00:00
7cc1c77225 do not display message when alterring git path 2022-01-15 16:02:14 -05:00
f0c4e85ac8 yellow to white 2022-01-15 15:14:24 -05:00
357e51acd1 spelling fixes 2022-01-15 11:00:58 -05:00
f39aade500 Update to Git 2.34.0and Clink 1.2.46 2021-11-21 13:50:54 -05:00
004535e0bc remove -all 2021-11-21 13:40:53 -05:00
6ae2f97f52 add quotes 2021-11-21 13:32:57 -05:00
0326f2e3a8 Merge branch 'master' of https://github.com/cmderdev/cmder into conemu-up 2021-11-21 13:24:56 -05:00
9f065a63e8 Ps1 git discovery (#2438)
* Fix start errors in path with ()

* Fix start errors in path with ()

* Fix start errors in path with ()

* Fix start errors in path with ()

* remove quotes from debug_output messages

* remove quotes from debug_output messages

* remove quotes from debug_output messages

* discovery newer git version

* new git path config for powershell

* xxx

* add isGitShim

* fix no git found in path

* debug

* revert not ps1 changes

* cleanup

* final

* spacing

* fixes

* cleanup

* cleanup

* timer for Powershell

* fixes

* fixes for git path settings

* grab vendor/bin/alias.cmd from master

Co-authored-by: Dax T. Games <dtgaes@kinggeek.org>
Co-authored-by: dgames <dgames@dtg.local>
2021-11-16 14:22:17 +00:00
59dfa9c46f Revert "Fix a problem with an ampersand character in path" 2021-11-11 07:35:04 -05:00
a4cb56b083 Merge pull request #2618 from xpam-net/master
Fix a problem with an ampersand character in path
2021-11-11 07:17:33 -05:00
ad6979d25f Merge pull request #2621 from chehrlic/clink_git_speedup
Speed up git status / conflict status by calling git only once.
2021-11-10 05:55:04 -05:00
addcefdd47 Speed up git status / conflict status by calling git only once. 2021-11-08 17:43:46 +01:00
0637d6b3e9 Merge branch 'master' into conemu-up 2021-11-07 17:54:54 -05:00
f24266014f update clink and git 2021-11-07 13:03:44 -05:00
c27cedc9b3 quote PATH settings 2021-11-07 10:54:33 -05:00
4c85e8b2f1 Fix a problem with an ampersand character in path
If the path variable contained values with an ampersand character (such as in the case of MySQL), the string splits by this character, and tries to execute what follows as a separate command. 
All occurrences of the set command containing %PATH% should be wrapped in quotation marks
2021-10-29 09:13:35 +02:00
c75c02c9ce update Clink and Conemu versions 2021-10-20 21:10:38 -04:00
9de284123c Fix the env not showing
Turns out the `{env}` part was missing from the prompt constructor
2021-09-25 16:32:52 +03:00
93715461e6 Merge pull request #2606 from daxgames/cmder_diag
Cmder diag - Save output to a file.
2021-09-17 12:35:24 -04:00
fc6cf025be save cmder_diag.* output to a file 2021-09-17 12:28:49 -04:00
f809af1eec save cmder_diag.* output to a file 2021-09-17 12:22:25 -04:00
6d1e2d6e8b Fix Posh-Git 1.0.0 import and console. 2021-08-31 08:40:46 +02:00
2ef8c967d2 update conemu and clink (#2575)
* update conemu and clink

* update clink to 1.2.24

* update clink to 1.2.24

* update clink to 1.2.24

* Clink 1.2.26

Co-authored-by: dgames <dgames@dtg.local>
2021-08-19 16:47:47 +01:00
b885b4e235 Clink 1.2.26 2021-08-13 21:36:58 -04:00
f717f5031b update clink to 1.2.24 2021-08-07 03:30:40 -04:00
710cc3ecc3 update clink to 1.2.24 2021-08-07 03:27:13 -04:00
0fc6b6571e update clink to 1.2.24 2021-08-07 03:25:34 -04:00