Commit Graph

575 Commits

Author SHA1 Message Date
Benjamin Staneck
0051614e4b Update packignore 2015-10-14 05:13:13 +02:00
Benjamin Staneck
d6b54eec24 Merge pull request #612 from JanSchulz/user-startup
Add a user startup file which can be modified
2015-10-13 18:12:27 +02:00
Benjamin Staneck
052ab118e2 Merge pull request #398 from mikesigs/development
Handle quoted paths
2015-10-13 17:52:12 +02:00
Mike Sigsworth
c46eb6a525 Merge remote-tracking branch 'upstream/development' into development
Conflicts:
	bin/alias.bat
2015-10-12 21:32:33 -06:00
Jan Schulz
48259b87ac Add a user startup file which can be modified
Up to now, init.bat would be overwritten when a user updated
Cmder. The new mechanism will create a new (mostly empty) file
for the user to enter commands which will then be executed on
each following startup.
2015-10-12 15:15:33 +02:00
Benjamin Staneck
2a26026749 Update README.md
Update Gitter badge
2015-10-12 14:30:04 +02:00
Benjamin Staneck
d68816bd11 Update readme 2015-10-12 13:29:47 +02:00
Benjamin Staneck
419c785db5 Merge pull request #575 from Bobo1239/enhance-path
Enhance Path in profile.ps1
2015-10-12 13:24:07 +02:00
Benjamin Staneck
c15e3f4ebd Merge pull request #585 from Stanzilla/revert_powershell
Revert "Run PowerShell as default"
2015-10-12 13:23:43 +02:00
Benjamin Staneck
1f75f85b7c Merge pull request #605 from Stanzilla/bumpgit
Converting msysgit support to git-for-windows support.
2015-10-12 13:23:06 +02:00
Benjamin Staneck
4203a8a4ea Merge pull request #653 from vladimir-kotikov/development
Upgrade clink-completions to 0.2.0
2015-10-12 13:11:44 +02:00
Benjamin Staneck
cf8a992e37 Merge pull request #601 from Stanzilla/bump_conemu
⬆️ ConEmu@150816
2015-10-12 13:10:23 +02:00
Benjamin Staneck
cec7fa3398 Merge eec3fd5578 2015-10-12 13:08:16 +02:00
Benjamin Staneck
83c685cdc7 ⬆️ ConEmu to v15.09.13 2015-10-12 13:06:50 +02:00
Benjamin Staneck
24fd027cda Update ConEmo project URL 2015-10-12 13:06:50 +02:00
Benjamin Staneck
df259195ab ⬆️ ConEmu@150816 2015-10-12 13:06:50 +02:00
Malobre
20b8b09419 Add -ExecutionPolicy Bypass to the powershell tasks
Fix issue #483
2015-10-12 13:02:43 +02:00
Thomas Chacko
7bc71010c2 Update .gitignore 2015-10-12 13:02:30 +02:00
Benjamin Staneck
e5eadc766f Merge pull request #543 from malobre/patch-1
Add  `-ExecutionPolicy Bypass` to powershell tasks
2015-10-12 12:53:36 +02:00
Benjamin Staneck
f638e93c21 Merge pull request #548 from thomgit/master
Update .gitignore
2015-10-12 12:53:12 +02:00
Benjamin Staneck
6608e16c3b Merge pull request #634 from Stanzilla/revert_cleanupgit
Revert 8b8f98c
2015-10-12 12:52:39 +02:00
Benjamin Staneck
d979140bb5 Merge pull request #569 from eeree/issue_568
Fixed: 'Enable-GitColors is Obsolete...' warning
2015-10-12 12:52:08 +02:00
Benjamin Staneck
568e2cfcdd Merge pull request #600 from Maximus5/br-xml-location
Use standard path for ConEmu.xml
2015-10-12 12:50:28 +02:00
Jack
a9ee246241 Merge pull request #606 from pyprism/patch-1
New URL to ConEmu now hosted on github.
2015-10-07 13:01:34 +01:00
Jack
d4ee65405d Merge pull request #651 from jkingsman/typos-phrasing
Fix typos and better phrasing.
2015-10-07 13:00:06 +01:00
Jack
3c1aa08313 Merge pull request #652 from jkingsman/patch-2
Make wording clearer
2015-10-07 12:58:22 +01:00
Benjamin Staneck
36291ab789 ⬆️ Git for Windows to v2.6.1.windows.1 2015-10-06 21:16:32 +02:00
Vladimir Kotikov
73c8c0c233 Upgrade clink-completions 2015-10-06 21:45:32 +03:00
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