Commit Graph

1797 Commits

Author SHA1 Message Date
Jack Kingsman
61a9b83c42 Make wording clearer 2015-10-02 19:06:18 -07:00
Jack Kingsman
5bcddd6b44 fix typos and better phrasing 2015-10-02 18:58:55 -07:00
Benjamin Staneck
32cd7dcb58 ⬆️ Git to v2.6.0.windows.1 2015-09-30 20:35:13 +02:00
Benjamin Staneck
b40b0067c0 ⬆️ Git to v2.5.3.windows.1 2015-09-23 20:51:53 +02:00
Benjamin Staneck
4edec1675a update to 2.5.2 release 2 2015-09-16 06:18:29 +02:00
Benjamin Staneck
4ed35fe110 Revert 8b8f98c
Breaks Git: #503 #521, because git <command> actually uses git-<command>.
2015-09-11 23:51:10 +02:00
Benjamin Staneck
583109b695 update to 2.5.2 2015-09-11 22:53:21 +02:00
Benjamin Staneck
f783cd8add fix readme 2015-09-05 00:04:51 +02:00
Benjamin Staneck
6952d602d2 update to 2.5.1
https://github.com/git-for-windows/git/releases/tag/v2.5.1.windows.1
2015-09-02 19:50:44 +02:00
Maximus5
eec3fd5578 Backup and restore ConEmu.xml on ./build.ps1 2015-09-01 20:09:17 +03:00
Maximus5
7c907a5174 Use standard path for ConEmu.xml 2015-09-01 20:09:17 +03:00
Martin Kemp
30f7847852 Merge pull request #619 from Stanzilla/bump_clink
Update clink to 0.4.5
2015-09-01 13:10:54 +01:00
Benjamin Staneck
801a4ac901 update readme 2015-08-31 05:05:16 +02:00
Benjamin Staneck
143e659187 ⬆️ clink to 0.4.5 2015-08-31 04:48:46 +02:00
Benjamin Staneck
7fd43b939b delete our own, now obsolete agent launcher 2015-08-31 04:40:10 +02:00
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 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