Commit Graph

1360 Commits

Author SHA1 Message Date
Dax T. Games
0a4d3bcb77 update Clink and Git 2022-07-15 10:04:30 -04:00
Dax T Games
7beb490048
Merge pull request #2695 from goodusername123/master
Update Git for Windows and Clink
2022-04-25 18:42:06 -04:00
goodusername123
f2d8e31e2e
Update clink URL
Updates the Clink URL in the readme to point to the newer maintained version of Clink that is used by Cmder.
2022-04-25 16:58:37 -05:00
goodusername123
6e05a9105f
Fix and Update changelog 2022-04-25 16:54:49 -05:00
goodusername123
62bfbb4501
Update Git for Windows to 2.36.0 2022-04-25 16:49:28 -05:00
goodusername123
8bf40227e8
Update Clink to 1.3.16 2022-04-25 16:47:34 -05:00
Dax T Games
cf61b81f01
Merge pull request #2691 from daxgames/clink_1.3.15
Clink 1.3.15
2022-04-16 14:02:55 -04:00
Dax T. Games
427937918e update Clink to 1.3.15 2022-04-16 13:41:01 -04:00
Dax T. Games
fe29497878 update Clink to 1.3.14 2022-04-16 13:36:24 -04:00
Dax T Games
f3fcb8be4a
Merge pull request #2689 from daxgames/fix_find_git
Fix find git
2022-04-16 11:51:37 -04:00
Dax T. Games
36e13027f6 CHANGELOG.md 2022-04-16 11:42:27 -04:00
Dax T. Games
ef51ed2be2 Merge branch 'fix_find_git' of https://github.com/daxgames/cmder into fix_find_git 2022-04-16 11:35:41 -04:00
Dax T. Games
6d313853f3 only look at \cmd\git.exe for found git 2022-04-16 11:35:19 -04:00
Dax T Games
f46e8b81d8
Merge branch 'master' into fix_find_git 2022-04-16 11:18:38 -04:00
Dax T. Games
864b85f254 CHANGELOG.md 2022-04-16 11:14:22 -04:00
Dax T. Games
ce02fb4a0e fix find latest git 2022-04-16 10:51:26 -04:00
Dax T Games
e345f187d8
Remove set term=cygwin in init.bat (#2688) 2022-04-16 15:01:17 +01:00
Dax T Games
fc00cc8be2
Merge pull request #2680 from daxgames/fix_git_worktree
Fix git worktree
2022-03-17 08:14:08 -04:00
dgames
0dd2a665e2 CHANGELOG.md 2022-03-17 08:10:18 -04:00
dgames
6189f4f0e6 fix prompt branch for git worktree 2022-03-17 07:57:48 -04:00
Dax T Games
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
Dax T Games
99452c8158
Merge pull request #2661 from geekrumper/master
Fix #2654: blank space added between {cwd} and version_control variable
2022-02-03 17:46:30 -05:00
Edouard Coissy
4098265a36 Fix #2654: blank space added between {cwd} and version_control variable 2022-02-02 14:13:51 +01:00
Vinay Sajip
eab4454ac5 Fix #2659: Use get_hg_branch() to get Mercurial branch information. 2022-01-29 14:48:58 +00:00
Dax T Games
711fe2895e
Merge pull request #2648 from daxgames/fix_posh_colors
Fix posh colors
2022-01-15 16:04:17 -05:00
dgames
7cc1c77225 do not display message when alterring git path 2022-01-15 16:02:14 -05:00
dgames
f0c4e85ac8 yellow to white 2022-01-15 15:14:24 -05:00
Dax T Games
ea0145448c
Merge pull request #2647 from daxgames/spellling_fixes
Spellling fixes
2022-01-15 11:24:05 -05:00
dgames
0281ee7dda CHANGELOG.md 2022-01-15 11:22:00 -05:00
dgames
f997da60e3 CHANGELOG.md 2022-01-15 11:20:33 -05:00
Dax T Games
34df88aa76
Merge pull request #2646 from daxgames/spellling_fixes
Spellling fixes
2022-01-15 11:17:02 -05:00
dgames
c51c3c55a8 add README config/profile.d 2022-01-15 11:12:38 -05:00
dgames
0e8c556e7d Merge branch 'master' of https://github.com/cmderdev/cmder into spellling_fixes 2022-01-15 11:01:22 -05:00
dgames
357e51acd1 spelling fixes 2022-01-15 11:00:58 -05:00
Dax T Games
66f9d582ec
Merge pull request #2635 from asoluter/master
Fix a problem with an ampersand character in path
2022-01-15 10:33:35 -05:00
Dax T Games
83a95d1412
Merge pull request #2629 from eltociear/patch-1
Fix typo in README.md
2022-01-15 10:32:03 -05:00
Ihor Sofiichenko
a1417f6cf9
Fix a problem with an ampersand character in path 2021-12-08 23:49:14 +02:00
Ikko Ashimine
8ea4bbb11c
Fix typo in README.md
enviroment -> environment
2021-11-30 20:34:31 +09:00
dgames
f39aade500 Update to Git 2.34.0and Clink 1.2.46 2021-11-21 13:50:54 -05:00
dgames
004535e0bc remove -all 2021-11-21 13:40:53 -05:00
dgames
6ae2f97f52 add quotes 2021-11-21 13:32:57 -05:00
dgames
0326f2e3a8 Merge branch 'master' of https://github.com/cmderdev/cmder into conemu-up 2021-11-21 13:24:56 -05:00
Dax T Games
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
Dax T Games
b6316eb447
Merge pull request #2624 from cmderdev/revert-2618-master
Revert "Fix a problem with an ampersand character in path"
2021-11-11 07:35:34 -05:00
Dax T Games
59dfa9c46f
Revert "Fix a problem with an ampersand character in path" 2021-11-11 07:35:04 -05:00
Dax T Games
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
Dax T Games
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
Christian Ehrlicher
addcefdd47 Speed up git status / conflict status by calling git only once. 2021-11-08 17:43:46 +01:00
dgames
0637d6b3e9 Merge branch 'master' into conemu-up 2021-11-07 17:54:54 -05:00
Dax T Games
f72c285d8b
Merge pull request #2609 from Lunchb0ne/env-fix-again
Fix no env in the prompt string
2021-11-07 14:41:53 -05:00