Commit Graph

982 Commits

Author SHA1 Message Date
Benjamin Staneck 5ce077a74a call git's own ssh-agent script instead of our own 2015-08-28 02:53:49 +02:00
Benjamin Staneck fc85915b2c git 2.5 packages the unix commands in <git>/usr/bin instead of <git>/binso add that to the path, too. 2015-08-28 02:47:02 +02:00
Ashutosh Das 63d35a9760 Update README.md 2015-08-24 06:38:11 +06:00
Benjamin Staneck 373a58e1e6 forgot one 2015-08-23 20:21:45 +02:00
Benjamin Staneck 3e06fcbf07 First step at converting msysgit support to git-for-windows support. 2015-08-23 20:09:06 +02:00
Martin Kemp ea1edda966 Merge remote-tracking branch 'bliker/development' into development 2015-08-18 23:56:11 +01:00
Martin Kemp 2857e4d6bc Merge remote-tracking branch 'bliker/master' into development 2015-08-18 23:55:44 +01:00
Benjamin Staneck ecbf7a01d1 Revert "Run PowerShell as default"
This reverts commit aaf70a4d9f.
2015-08-09 14:16:24 +02:00
Martin Kemp dc9263a11c Merge pull request #578 from Stanzilla/development
update VS to 2015 release version and switch to /MT for static linking
2015-08-04 14:55:02 +01:00
Benjamin Staneck 8659b9c6ed update VS to 2015 release version and switch to /MT for static linking 2015-08-04 15:00:32 +02:00
Boris Zhou 316a42b8f9 Enhance Path in profile.ps1 2015-08-03 16:06:41 +02:00
Kamil Szymański 676297c0d4 Fixed: 'Enable-GitColors is Obsolete...' warning 2015-07-31 21:45:32 +02:00
Thomas Chacko 3aff065210 Update .gitignore 2015-07-09 11:42:53 +05:30
Malobre f6a0447a9a Add -ExecutionPolicy Bypass to the powershell tasks
Fix issue #483
2015-07-01 12:55:20 +02:00
Martin Kemp 70b0615b34 Merge pull request #517 from bondz/patch-1
Remove depreciated Enable-GitColors in posh-git
2015-06-05 12:02:50 +01:00
Bond 2a1a736ceb Remove depreciated Enable-GitColors
The function Enable-GitColors is depreciated in dahlbyk/posh-git@4e778e2480 and should be removed here as well.
2015-06-04 23:25:09 +01:00
Martin Kemp 40fd96b135 Remove leftover history.
This is not needed and confuses users.
2015-05-20 10:55:17 +01:00
Martin Kemp 271b3ea876 Avoid commiting the wrong dlls 2015-05-19 18:37:34 +01:00
Martin Kemp c4873c6e58 Revert "Update to VS2015."
This reverts commit 53efab127e.
2015-05-19 15:48:04 +01:00
Martin Kemp 29d1378d7a Add git to PATH (while in Cmder)
Add bundled git to PATH if we can't find git on PATH.
2015-05-19 15:47:06 +01:00
Martin Kemp c15e29ecb3 $PSScriptRoot compatibility
$PSScriptRoot is not available on PS version 2 or below.

So we'll set it ourselves.
2015-05-19 15:44:32 +01:00
Martin Kemp c38f6b3a89 Merge branch 'master' into development 2015-05-17 23:45:07 +01:00
Martin Kemp 99ea376713 v1.2 2015-05-17 23:44:51 +01:00
Martin Kemp 2051078cc6 Merge pull request #479 from bliker/development
Fix cleanup script.
2015-05-17 23:21:23 +01:00
Martin Kemp 6c5034164c Fix cleanup script. 2015-05-17 22:42:00 +01:00
Martin Kemp 4651201b6c Merge branch 'master' of https://github.com/bliker/cmder v1.2 2015-05-17 22:26:31 +01:00
Martin Kemp 3966ed9433 Merge branch 'development' 2015-05-17 22:25:08 +01:00
Martin Kemp 2383777418 Merge conflict 2015-05-17 22:24:38 +01:00
Martin Kemp a18320c938 Improve warning text when posh-git is missing. 2015-05-17 22:13:23 +01:00
Martin Kemp 83a853bd52 Fix build script. 2015-05-17 22:13:04 +01:00
Martin Kemp 53efab127e Update to VS2015. 2015-05-17 22:12:49 +01:00
Martin Kemp 4de72b68dd Update ConEmu.xml for latest update. 2015-05-17 22:11:10 +01:00
Martin Kemp f196375f53 Update to latest ConEmu. 2015-05-17 22:08:35 +01:00
Martin Kemp 696a0d7622 Merge branch 'development' of https://github.com/MartiUK/cmder into development 2015-04-30 11:49:25 +01:00
Martin Kemp 7217d5c536 Merge pull request #451 from MartiUK/development
Update sources.json
2015-04-02 13:03:22 +01:00
Martin Kemp e549f88b00 Removed extra quotation mark 2015-04-02 12:02:34 +01:00
Martin Kemp 687fb72397 Update sources for 1.2
Updated sources.
2015-04-02 12:00:44 +01:00
Martin Kemp a5968d3d49 Merge pull request #2 from bliker/development
Run PowerShell as default
2015-03-26 10:21:54 +00:00
Martin Kemp aaf70a4d9f Run PowerShell as default 2015-03-25 15:11:35 +00:00
Martin Kemp 717b9f990e Write vendor version to .cmderver file
For a future feature.
2015-03-25 15:09:23 +00:00
Martin Kemp 4f0e51c6a8 Merge pull request #441 from Jackbennett/ps-register-cmder
Helper function using powershell to register the cmder context menu
2015-03-25 15:08:14 +00:00
Martin Kemp 520e7cfc0d Merge pull request #440 from Jackbennett/proper-git-check
git and Posh-git check
2015-03-25 15:07:51 +00:00
Jack Bennett 84dc9c5f0c Helper function using powershell to register the cmder context menu
Function must be run as an administrator since we're touching the
registry.

A neat by product is that users can now re-run this command and set custom
icons.

I'm not sure what the `%V` command does but it's not opening in the targeted
folder as yet.

The output is a little ugly at rpesent.
2015-03-25 14:34:25 +00:00
Jack Bennett c466698d6b Only write VCS Status if we're in a git repo
In an effort to speed up the prompt we will only call write-vcsstatus if
there is a .git folder in the current or any parent path recursively.

As this function is called every new prompt line it needs to be as fast as
possible.
2015-03-25 12:29:10 +00:00
Jack Bennett 18fc5e37c7 Check that git can really be used as well as posh-git
Explicitly call `import posh-git` because it doesn't have a module
manifest thus powershell can't autoload it when using a cmdlet.

At present the cmder repo doesn't try to download posh-git so it might be
missing from the users session.
2015-03-25 12:22:07 +00:00
Martin Kemp 2292348f95 Merge pull request #438 from vladimir-kotikov/development
Improves performance of prompt filtering
2015-03-22 02:46:52 +00:00
Vladimir Kotikov 2855a699a1 Removes error messages when getting repo status
When `get_git_status` fails the inner `os.execute` call print error
message to console. This removes all error messages fro such cases.
2015-03-22 00:42:40 +03:00
Vladimir Kotikov d8c9d32cb2 Improve performance of git and mercurial prompt
This implements custom logic to detect if we're inside of working tree
and skips os calls if not. This will improve performance of prompt
handling, especially for mercurial prompt.
2015-03-22 00:42:40 +03:00
Martin Kemp 522a75835f Merge pull request #434 from vladimir-kotikov/development
Preview PR for including external completions into Cmder
2015-03-20 21:38:06 +00:00
Vladimir Kotikov b75b3239e7 Adds clink-completions as an external dependency
* Adds package to sources.json
* Merges all cmder's lua modules into one -> cmder.lua to exclude future conflicts
* Adds external modules loading logic
2015-03-20 22:29:34 +03:00