images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-15 08:19:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,748 Commits 9 Branches 38 Tags 6.7 MiB
f8aa7feb1f
Commit Graph

1748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
b0bh00d
89499f2a60 Replaced the 'hg -id' command with the 'hg branch' and 'hg status' pair for improved response times. 2019-01-20 21:02:31 -07:00
b0bh00d
95e5169476 Merge remote-tracking branch 'upstream/master' 2019-01-20 20:50:09 -07:00
Dax T. Games
760f4e579e ignore all /d arg if running inside vscode 2019-01-06 18:09:06 -05:00
Dax T. Games
6d8f7a290a ignore all args if running inside vscode 2019-01-06 17:46:50 -05:00
Dax T. Games
2a4e9d8301 workaround vscode tasks showing cmder debug output 2019-01-06 17:27:04 -05:00
Bob Hood
961f38a399 Updated the HG prompt (#2002) 
Per our email discussion, I have updated the HG prompt code to use the '-ib' option to 'hg id' so the branch name is always available, regardless of the state of the working copy.
 2019-01-05 19:56:30 +01:00
b0bh00d
5a48e568a8 Updated the HG prompt code to use the '-ib' option to 'hg id' to always have the branch name available. 2019-01-01 11:17:53 -07:00
Dax T Games
524fce25ab
Merge pull request #1999 from daxgames/fix_ssh_agent_default 
fix ssh-agent in user_profile.cmd.default
 2018-12-22 17:13:35 -05:00
Dax T. Games
46bde1af8b fix ssh-agent in user_profile.cmd.default 2018-12-22 17:07:31 -05:00
Dax T. Games
9a47bce6ac fix ssh-agent in user_profile.cmd.default 2018-12-22 17:05:08 -05:00
Dax T Games
0a3be464be
Merge pull request #1997 from cmderdev/revert-1996-fix_ssh_agent_default 
Revert "Update Changelog"
 2018-12-22 16:56:42 -05:00
Dax T Games
b2723d6f6a
Merge pull request #1998 from cmderdev/revert-1995-fix_ssh_agent_default 
Revert "fix sshagent call in user_profile.cmd.default"
 2018-12-22 16:56:19 -05:00
Dax T Games
4f2ced57df
Revert "fix sshagent call in user_profile.cmd.default" 2018-12-22 16:55:56 -05:00
Dax T Games
88169b8721
Revert "Update Changelog" 2018-12-22 16:55:17 -05:00
Dax T Games
f6db922732
Merge pull request #1996 from daxgames/fix_ssh_agent_default 
Update Changelog
 2018-12-22 16:40:28 -05:00
Dax T. Games
e822d55aa5 Changelog 2018-12-22 16:38:51 -05:00
Dax T. Games
ccb6cb80e5 Changelog 2018-12-22 16:37:28 -05:00
Dax T. Games
e56ed810a0 Changelog 2018-12-22 16:34:23 -05:00
Dax T Games
7e8d67caa8
Merge pull request #1995 from daxgames/fix_ssh_agent_default 
fix sshagent call in user_profile.cmd.default
 2018-12-22 16:12:49 -05:00
Dax T. Games
4e4f050374 fix sshagent call in user_profile.cmd.default 2018-12-22 15:40:09 -05:00
Martin Böhm
51e75d4bb5 add percent escaping for string.gsub (#1991) 
In `string.gsub()`, the `%` character has special meaning and must be escaped to be treated verbatim, otherwise the "invalid use of '%' in replacement string" warning will show up.

This adds a verbatim() function for that purpose. It fixes this warning for situations where `'%` characters are in the current path (cwd), version control branch names, or in the previous `PROMPT` set by the user.
 2018-12-19 21:17:45 +01:00
Dax T Games
f4389fc552
Merge pull request #1988 from daxgames/no_prefer_nix_option_ 
Prefer /nix_tools option
 2018-12-16 13:08:56 -05:00
Dax T Games
8101923242
Merge pull request #1987 from seeq12/default-files-user-profile 
Use default files for default user profiles
 2018-12-16 10:31:48 -05:00
Cody Ray Hoeft
7e1bc4297a Move ssh-agent logic to lib script 2018-12-13 21:12:18 -08:00
Dax T Games
0f30329e38
Update init.bat 2018-12-13 21:55:08 -05:00
Dax T Games
25820ae4d4
Merge pull request #1975 from patstew/git-no-unix 
Add /git_no_unix switch to init.bat to prevent adding !GIT_INSTALL_ROOT!\usr\bin to PATH
 2018-12-13 21:51:01 -05:00
Dax T. Games
528a69dab9 update nix_tools option to allow preferring nix tools 2018-12-13 20:54:18 -05:00
Cody Ray Hoeft
0c9e0e2f8c Use default files for default user profiles 2018-12-13 12:13:17 -08:00
Patrick Stewart
20eb7b8e81 Add /nix_tools switch to init.bat to optionally add !GIT_INSTALL_ROOT!\usr\bin to PATH 2018-12-13 16:09:52 +00:00
Dax T Games
ab02c4ce46
Merge pull request #1982 from haroldhues/master 
make /register work with /single
 2018-12-12 21:05:52 -05:00
Cody Ray Hoeft
f9f06a5595 make /register work with /single 2018-12-07 21:05:51 -08:00
Dax T. Games
8ac540ebb6 debug 2018-12-02 11:51:00 -05:00
Dax T. Games
fcab51da2b remove file 2018-12-02 11:46:23 -05:00
Dax T. Games
dc492c836f Merge branch 'master' of https://github.com/cmderdev/cmder into prefer_nix_option 2018-12-02 11:46:01 -05:00
Dax T. Games
1eb03dd1b8 add '/prefer_nix' switch to init.bat 2018-12-02 11:44:18 -05:00
Dax T Games
3163d6d1c3
Merge pull request #1971 from cmderdev/fix_1.3.9 
fix initial launch of cmder starting with conemu default cfg
 2018-11-30 15:00:35 -06:00
Dax T. Games
5c7f4943ad fix initial launch of cmder starting with conemu default cfg 2018-11-30 14:56:30 -05:00
Dax T Games
378ebff566
Merge pull request #1969 from rjvdboon/fix_1956 
Improve LANG env var detection
 2018-11-30 07:45:33 -06:00
Van der Boon, Robert GSNL-PTT/SPD
572a94ca3a Improve LANG env var detection 2018-11-30 12:01:21 +01:00
Dax T Games
22aa59bd83
Merge pull request #1949 from daxgames/multi-user 
Use user_conemu.xml or conemu-%computername%.xml directly if '-c [path]' is used to start cmder.
 2018-11-28 19:04:05 -06:00
Dax T. Games
eb6a332da2 Merge branch 'master' of https://github.com/cmderdev/cmder into multi-user 2018-11-22 16:21:24 -06:00
Dax T Games
dd614642b2
Merge pull request #1961 from DanielChesters/master 
Ensure use the system find and findstr command instead find/findstr from path
 2018-11-22 16:18:28 -06:00
Daniel Chesters
036cf09360
Ensure use the system find and findstr command instead find/findstr from path. Fix #1959 2018-11-22 21:14:02 +01:00
Dax T. Games
7203671fc9 fix powershell profile.d 2018-11-17 19:55:24 -05:00
Dax T. Games
787ac3773c make /register work with /c 2018-11-12 09:22:05 -05:00
Dax T. Games
b16aa7a29e better command line error handling 2018-11-12 08:30:44 -05:00
Dax T. Games
d8e8fc8adb add /m command line argument to use machine config rather than user config for conemu. 2018-11-12 07:56:55 -05:00
Dax T. Games
0efeaa91fa cleanup 2018-11-11 08:04:35 -05:00
Dax T. Games
8c0817941e added /c [path] use vendored conemu.xml as a default starting point if it exists 2018-11-11 07:55:14 -05:00
Dax T. Games
e17b04cbb9 cleanup 2018-11-10 18:49:33 -05:00