Commit Graph

  • 89499f2a60 Replaced the 'hg -id' command with the 'hg branch' and 'hg status' pair for improved response times. b0bh00d 2019-01-20 21:02:31 -07:00
  • 95e5169476 Merge remote-tracking branch 'upstream/master' b0bh00d 2019-01-20 20:50:09 -07:00
  • 760f4e579e ignore all /d arg if running inside vscode Dax T. Games 2019-01-06 18:09:06 -05:00
  • 6d8f7a290a ignore all args if running inside vscode Dax T. Games 2019-01-06 17:46:50 -05:00
  • 2a4e9d8301 workaround vscode tasks showing cmder debug output Dax T. Games 2019-01-06 17:27:04 -05:00
  • 961f38a399 Updated the HG prompt (#2002) Bob Hood 2019-01-05 11:56:30 -07:00
  • 5a48e568a8 Updated the HG prompt code to use the '-ib' option to 'hg id' to always have the branch name available. b0bh00d 2019-01-01 11:17:53 -07:00
  • 524fce25ab Merge pull request #1999 from daxgames/fix_ssh_agent_default v1.3.11 Dax T Games 2018-12-22 17:13:35 -05:00
  • 46bde1af8b fix ssh-agent in user_profile.cmd.default Dax T. Games 2018-12-22 17:07:31 -05:00
  • 9a47bce6ac fix ssh-agent in user_profile.cmd.default Dax T. Games 2018-12-22 17:05:08 -05:00
  • 0a3be464be Merge pull request #1997 from cmderdev/revert-1996-fix_ssh_agent_default Dax T Games 2018-12-22 16:56:42 -05:00
  • b2723d6f6a Merge pull request #1998 from cmderdev/revert-1995-fix_ssh_agent_default Dax T Games 2018-12-22 16:56:19 -05:00
  • 4f2ced57df Revert "fix sshagent call in user_profile.cmd.default" Dax T Games 2018-12-22 16:55:56 -05:00
  • 88169b8721 Revert "Update Changelog" Dax T Games 2018-12-22 16:55:17 -05:00
  • f6db922732 Merge pull request #1996 from daxgames/fix_ssh_agent_default Dax T Games 2018-12-22 16:40:28 -05:00
  • e822d55aa5 Changelog Dax T. Games 2018-12-22 16:38:51 -05:00
  • ccb6cb80e5 Changelog Dax T. Games 2018-12-22 16:37:28 -05:00
  • e56ed810a0 Changelog Dax T. Games 2018-12-22 16:34:23 -05:00
  • 7e8d67caa8 Merge pull request #1995 from daxgames/fix_ssh_agent_default Dax T Games 2018-12-22 16:12:49 -05:00
  • 4e4f050374 fix sshagent call in user_profile.cmd.default Dax T. Games 2018-12-22 15:40:09 -05:00
  • 51e75d4bb5 add percent escaping for string.gsub (#1991) Martin Böhm 2018-12-19 21:17:45 +01:00
  • f4389fc552 Merge pull request #1988 from daxgames/no_prefer_nix_option_ Dax T Games 2018-12-16 13:08:56 -05:00
  • 8101923242 Merge pull request #1987 from seeq12/default-files-user-profile Dax T Games 2018-12-16 10:31:48 -05:00
  • 7e1bc4297a Move ssh-agent logic to lib script Cody Ray Hoeft 2018-12-13 21:12:18 -08:00
  • 0f30329e38 Update init.bat Dax T Games 2018-12-13 21:55:08 -05:00
  • 25820ae4d4 Merge pull request #1975 from patstew/git-no-unix Dax T Games 2018-12-13 21:51:01 -05:00
  • 528a69dab9 update nix_tools option to allow preferring nix tools Dax T. Games 2018-12-13 20:54:18 -05:00
  • 0c9e0e2f8c Use default files for default user profiles Cody Ray Hoeft 2018-12-13 12:13:17 -08:00
  • 20eb7b8e81 Add /nix_tools switch to init.bat to optionally add !GIT_INSTALL_ROOT!\usr\bin to PATH Patrick Stewart 2018-12-03 15:30:54 +00:00
  • ab02c4ce46 Merge pull request #1982 from haroldhues/master Dax T Games 2018-12-12 21:05:52 -05:00
  • f9f06a5595 make /register work with /single Cody Ray Hoeft 2018-12-07 21:05:51 -08:00
  • 8ac540ebb6 debug Dax T. Games 2018-12-02 11:51:00 -05:00
  • fcab51da2b remove file Dax T. Games 2018-12-02 11:46:23 -05:00
  • dc492c836f Merge branch 'master' of https://github.com/cmderdev/cmder into prefer_nix_option Dax T. Games 2018-12-02 11:46:01 -05:00
  • 1eb03dd1b8 add '/prefer_nix' switch to init.bat Dax T. Games 2018-12-02 11:44:18 -05:00
  • 3163d6d1c3 Merge pull request #1971 from cmderdev/fix_1.3.9 v1.3.10 Dax T Games 2018-11-30 15:00:35 -06:00
  • 5c7f4943ad fix initial launch of cmder starting with conemu default cfg Dax T. Games 2018-11-30 14:56:30 -05:00
  • 378ebff566 Merge pull request #1969 from rjvdboon/fix_1956 Dax T Games 2018-11-30 07:45:33 -06:00
  • 572a94ca3a Improve LANG env var detection Van der Boon, Robert GSNL-PTT/SPD 2018-11-30 12:01:21 +01:00
  • 22aa59bd83 Merge pull request #1949 from daxgames/multi-user Dax T Games 2018-11-28 19:04:05 -06:00
  • eb6a332da2 Merge branch 'master' of https://github.com/cmderdev/cmder into multi-user Dax T. Games 2018-11-22 16:21:24 -06:00
  • dd614642b2 Merge pull request #1961 from DanielChesters/master Dax T Games 2018-11-22 16:18:28 -06:00
  • 036cf09360 Ensure use the system find and findstr command instead find/findstr from path. Fix #1959 Daniel Chesters 2018-11-22 21:14:02 +01:00
  • 7203671fc9 fix powershell profile.d Dax T. Games 2018-11-17 19:55:24 -05:00
  • 787ac3773c make /register work with /c Dax T. Games 2018-11-12 09:22:05 -05:00
  • b16aa7a29e better command line error handling Dax T. Games 2018-11-12 08:30:44 -05:00
  • d8e8fc8adb add /m command line argument to use machine config rather than user config for conemu. Dax T. Games 2018-11-12 07:56:55 -05:00
  • 0efeaa91fa cleanup Dax T. Games 2018-11-11 08:04:35 -05:00
  • 8c0817941e added /c [path] use vendored conemu.xml as a default starting point if it exists Dax T. Games 2018-11-11 07:55:14 -05:00
  • e17b04cbb9 cleanup Dax T. Games 2018-11-10 18:49:33 -05:00
  • e904ebce72 use user_conemu.xml or conemu-%computername%.xml directly if '-c [path]' is used to start cmder. Dax T. Games 2018-11-10 17:25:17 -05:00
  • a226019d5a Merge pull request #1948 from daxgames/fix_timer v1.3.8 Dax T Games 2018-11-10 14:00:38 -05:00
  • d04cc1f04e fix timer error Dax T. Games 2018-11-10 13:57:26 -05:00
  • 2e77513674 Merge pull request #1947 from daxgames/fix_ignore_config v1.3.7 Dax T Games 2018-11-10 09:46:25 -05:00
  • 1640e9c01d fixes' Dax T. Games 2018-11-10 09:45:23 -05:00
  • ddbfd1da18 Merge branch 'fix' Dax T. Games 2018-11-10 09:38:58 -05:00
  • bc7c6e97b3 Fixed move of default conemu.xml to the vendor folder Dax T. Games 2018-11-10 09:32:44 -05:00
  • 45f05ed8fa Merge pull request #1946 from cmderdev/revert-1945-ignore_config Dax T Games 2018-11-10 09:02:00 -05:00
  • 72b676b939 Revert "Ignore %cmder_root%\config (#1945)" Dax T Games 2018-11-10 06:42:27 -05:00
  • 637b0fd3ac Ignore %cmder_root%\config (#1945) Dax T Games 2018-11-09 20:40:16 -05:00
  • ce62db6d33 cleanup Dax T. Games 2018-11-08 21:45:21 -05:00
  • f3ed7b6d1b ignore all of config folder Dax T. Games 2018-11-08 21:35:23 -05:00
  • 57e5ae1719 move default comemu.xml to vendor folder Dax T. Games 2018-11-08 21:25:42 -05:00
  • a5bdecca77 Add /f for fast init. (#1942) Dax T Games 2018-11-03 20:36:51 -04:00
  • 5be25f29f8 Initialize time_init to fix init error message Gregory Lucas 2018-11-03 10:19:34 -04:00
  • cb78f0486a Remove duplicate Install-Module detection Merlin 2018-10-30 15:22:39 +01:00
  • f5ac81daa0 Fix typos, remove escaping inside inline code, replace single quote with backtick Josef Pihrt 2018-11-02 18:37:13 +01:00
  • da0aea96f8 Fix typo and broken link Josef Pihrt 2018-11-02 18:32:28 +01:00
  • 3a11d45552 add diag helper scripts and adds to the path (#1918) Dax T Games 2018-11-02 09:00:41 -04:00
  • c5a6afbf5b Merge pull request #1905 from narnaud/git_shim Benjamin Staneck 2018-10-12 22:55:48 +02:00
  • a607f0f2d5 Ensure the right git path is found in case of shim. Nicolas Arnaud-Cormos 2018-10-10 07:11:58 +02:00
  • 66da1716bc Merge pull request #1758 from xiazeyu/master Benjamin Staneck 2018-09-30 18:06:42 +02:00
  • bfaa194468 Merge pull request #1 from daxgames/cexec Retomehere 2018-09-30 23:17:23 +08:00
  • c3956e307a Merge pull request #1889 from leochien0102/leochien0102-patch-1 Benjamin Staneck 2018-09-29 23:15:26 +02:00
  • 3344268c24 Merge pull request #1887 from gaoslin/master Dax T Games 2018-09-29 17:06:53 -04:00
  • 8ff459b309 fixes Dax T. Games 2018-09-24 19:07:48 -05:00
  • 103d0a6cea more headers Dax T. Games 2018-09-24 18:51:55 -05:00
  • 8dc9bc9ae1 fix the 'was unexpected at this time.' leochien0102 2018-09-21 16:01:52 +08:00
  • bb4ed4af51 Update init.bat gaoslin 2018-09-18 17:26:11 +08:00
  • ae2fda72fd Merge pull request #1884 from daxgames/fix_lua Benjamin Staneck 2018-09-18 03:03:57 +02:00
  • bda09bc274 init.bat update for cexec Dax T. Games 2018-09-16 16:23:22 -05:00
  • 749ce17dbe git prompt yellow Dax T. Games 2018-09-16 15:53:49 -05:00
  • 8cf59d1cbf cleanup Dax T. Games 2018-09-16 10:21:37 -05:00
  • 1d36ba4ed4 fix user lua and git detection Dax T. Games 2018-09-16 10:18:10 -05:00
  • 564ef5220e allow conditionally setting environment variables Dax T. Games 2018-09-15 16:25:31 -05:00
  • f84da84e15 cleanup Dax T. Games 2018-09-15 15:12:45 -05:00
  • 86544c9188 readme.md Dax T. Games 2018-09-15 15:11:50 -05:00
  • 4aec21ce19 readme.md Dax T. Games 2018-09-15 15:10:35 -05:00
  • 0be94725bd readme.md Dax T. Games 2018-09-15 15:06:13 -05:00
  • 9dce9d0f62 added exit codes Dax T. Games 2018-09-15 13:55:54 -05:00
  • 669e997602 flag_exists.cmd to flag_exec.cmd, also to lib as an option Dax T. Games 2018-09-15 12:52:23 -05:00
  • 0730c6e32b Merge branch 'master' into master Retomehere 2018-09-15 11:28:04 +08:00
  • 0d2e16c653 Merge pull request #1871 from daxgames/user_lua Benjamin Staneck 2018-09-13 22:41:19 +02:00
  • 35eab7a51a Merge pull request #1834 from b0bh00d/master Benjamin Staneck 2018-09-13 18:07:07 +02:00
  • 2cfa7c45fc ⬆️ ConEmu to 180626 Benjamin Staneck 2018-09-13 18:05:36 +02:00
  • ab0de6d157 ⬆️ Update Git to 2.19.0 Benjamin Staneck 2018-09-13 17:58:29 +02:00
  • bd9cff2691 cleanup Dax T. Games 2018-09-05 18:07:27 -05:00
  • 9b121f1c0a switch to taskdialog David Refoua 2018-09-05 04:22:42 +04:30
  • cfe22c8ef0 set encoding to UTF-8 David Refoua 2018-09-05 03:22:57 +04:30
  • 3ef53f64d4 add strings.rc2 David Refoua 2018-09-05 03:18:59 +04:30