Anthony Scopatz
|
6fa8e44e5d
|
Merge branch 'string' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-string
|
2015-03-20 12:01:00 -05:00 |
|
Anthony Scopatz
|
bec73c8d31
|
Merge branch 'wrywerytwreywery-docs'
|
2015-03-20 11:57:29 -05:00 |
|
Anthony Scopatz
|
c702b01435
|
Merge branch 'docs' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-docs
|
2015-03-20 11:56:26 -05:00 |
|
Anthony Scopatz
|
9c6566b69c
|
Merge branch 'SmartViking-master'
|
2015-03-20 11:49:13 -05:00 |
|
adam j hartz
|
b5204f02fd
|
merge upstream updates
|
2015-03-19 22:37:06 -04:00 |
|
adam j hartz
|
bba66d66ef
|
Change syntax from ${} to @()
|
2015-03-19 22:29:35 -04:00 |
|
adam j hartz
|
6969150a72
|
convert result of ${} expression to string
|
2015-03-19 21:37:59 -04:00 |
|
Mattias Ugelvik
|
0a61a14b20
|
Removed subproc_line , fixed typos, small changes
`subproc_line` wasn't used and probably contained a bug
|
2015-03-19 20:18:02 +01:00 |
|
Anthony Scopatz
|
c285c02a9c
|
Merge pull request #104 from eyalzek/master
Add an explanation for shift+tab indentation to the docs
|
2015-03-19 10:58:13 -05:00 |
|
eyalzek
|
1121145893
|
add shift+tab indentation to docs
|
2015-03-19 17:39:10 +02:00 |
|
adam j hartz
|
fb9efc4ba9
|
documentation for environment variables
|
2015-03-19 07:51:26 -04:00 |
|
adam j hartz
|
f07a338da2
|
rename some environment variables
|
2015-03-19 07:51:14 -04:00 |
|
Anthony Scopatz
|
637702f861
|
hotfix for hanging
|
2015-03-19 00:36:12 -05:00 |
|
Anthony Scopatz
|
546e1fc336
|
Merge branch 'wrywerytwreywery-run_script'
|
2015-03-18 20:48:48 -05:00 |
|
adam j hartz
|
5664ce44d7
|
fix for comment parsing
|
2015-03-18 21:36:26 -04:00 |
|
Anthony Scopatz
|
cf8c8460f8
|
Merge pull request #98 from scopatz/script
fix for comment only lines
|
2015-03-18 20:21:56 -05:00 |
|
Anthony Scopatz
|
dcd4a20271
|
fix for comment only line
|
2015-03-18 20:14:53 -05:00 |
|
Anthony Scopatz
|
831e0c07b5
|
Merge branch 'admiralobvious-cd_oldpwd'
|
2015-03-18 19:44:59 -05:00 |
|
Anthony Scopatz
|
3c31e4ef2d
|
Merge branch 'cd_oldpwd' of https://github.com/admiralobvious/xonsh into admiralobvious-cd_oldpwd
|
2015-03-18 19:44:16 -05:00 |
|
Anthony Scopatz
|
d01c48b819
|
Merge branch 'SavinaRoja-master'
|
2015-03-18 19:42:43 -05:00 |
|
Anthony Scopatz
|
7573d4472c
|
Merge branch 'master' of https://github.com/SavinaRoja/xonsh into SavinaRoja-master
|
2015-03-18 19:41:34 -05:00 |
|
Anthony Scopatz
|
db3c4873a6
|
Merge branch 'wrywerytwreywery-run_script'
|
2015-03-18 19:36:14 -05:00 |
|
Anthony Scopatz
|
9accda52ff
|
added some trailing newline safety to main.py
|
2015-03-18 19:35:50 -05:00 |
|
Alexandre Ferland
|
4a6d1017fa
|
change_update
Set the value instead of update().
|
2015-03-18 20:32:18 -04:00 |
|
Anthony Scopatz
|
8c5f9dc643
|
Merge branch 'run_script' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-run_script
|
2015-03-18 19:28:57 -05:00 |
|
adam j hartz
|
dfd63dedd6
|
small refactor
|
2015-03-18 20:09:29 -04:00 |
|
adam j hartz
|
b03156a047
|
make script mode recognize contents of xonshrc
|
2015-03-18 20:01:00 -04:00 |
|
Anthony Scopatz
|
7b64acd574
|
some cleanup in tools
|
2015-03-18 18:51:22 -05:00 |
|
Anthony Scopatz
|
4e04bd1f02
|
Merge pull request #94 from SavinaRoja/master
updating the webm with some slight pauses
|
2015-03-18 18:44:31 -05:00 |
|
adam j hartz
|
5303d6294b
|
compile scripts with exec mode instead of single
|
2015-03-18 19:43:23 -04:00 |
|
Anthony Scopatz
|
a371800f91
|
Merge branch 'corbinbs-master'
|
2015-03-18 18:29:43 -05:00 |
|
Anthony Scopatz
|
2fcb88b972
|
Merge branch 'master' of https://github.com/corbinbs/xonsh into corbinbs-master
|
2015-03-18 18:27:39 -05:00 |
|
Paul Barton
|
ee5f1f4213
|
Non-recursive refactor of shell.cmdloop()
|
2015-03-18 19:21:09 -04:00 |
|
Anthony Scopatz
|
8e2203b5df
|
Merge branch 'ivh-bash_aliases'
|
2015-03-18 18:09:00 -05:00 |
|
Anthony Scopatz
|
237d8bcb4f
|
some aliases cleanup
|
2015-03-18 18:08:48 -05:00 |
|
adam j hartz
|
ad8fd1dda1
|
main.py takes script file or script on stdin
|
2015-03-18 19:04:25 -04:00 |
|
adam j hartz
|
b1423b78ee
|
main.py takes script file or script on stdin
|
2015-03-18 19:00:01 -04:00 |
|
adam j hartz
|
6aa711916a
|
Merge branch 'master2' into dirstack
|
2015-03-18 18:43:21 -04:00 |
|
Brian S. Corbin
|
477ce93c44
|
Tab Completion on OS X
|
2015-03-18 16:53:25 -04:00 |
|
Anthony Scopatz
|
83cf04c170
|
Merge branch 'bash_aliases' of https://github.com/ivh/xonsh into ivh-bash_aliases
|
2015-03-18 15:51:28 -05:00 |
|
Paul Barton
|
15d61eb14d
|
updating the webm with some slight pauses
|
2015-03-18 15:44:03 -04:00 |
|
Charlie Arnold
|
0ff1b8df5f
|
specify full path to README.rst
Fix #88
|
2015-03-18 10:38:16 -07:00 |
|
Thomas Marquart
|
6fe7cc3e87
|
loop over bash-aliases to skip problematic ones and issue waring.
|
2015-03-18 09:24:44 +01:00 |
|
Thomas Marquart
|
b50754d73e
|
remove offensive line
|
2015-03-18 07:05:20 +01:00 |
|
Thomas Marquart
|
79d2847476
|
rebasing off scopatz/master and fixing minor things before merge.
|
2015-03-18 06:44:29 +01:00 |
|
Thomas Marquart
|
3b9d4a324b
|
Fixes #56 about taking over bash aliases into xonsh.
|
2015-03-18 06:33:51 +01:00 |
|
Anthony Scopatz
|
d2072bc4bf
|
Merge branch 'glenbot-master'
|
2015-03-17 18:59:20 -05:00 |
|
Anthony Scopatz
|
8eb9851e57
|
Merge branch 'master' of https://github.com/glenbot/xonsh into glenbot-master
|
2015-03-17 18:57:47 -05:00 |
|
Anthony Scopatz
|
444bc338ca
|
aliases had no sense of self to update themselves.
|
2015-03-17 18:49:31 -05:00 |
|
Anthony Scopatz
|
f030704060
|
Merge branch 'wrywerytwreywery-subproc_error_msg'
|
2015-03-17 18:39:03 -05:00 |
|