789 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
adam j hartz	8e3af41a53	dirstack: PEP8 fixes	2015-03-21 20:50:06 -04:00
adam j hartz	4e9fe71394	pushd bugfix	2015-03-21 20:48:50 -04:00
adam j hartz	fca90ec0dd	maximum dirstack size	2015-03-21 20:29:28 -04:00
adam j hartz	81d3616c46	add quiet mode to pushd and popd	2015-03-21 20:27:54 -04:00
adam j hartz	4c91c84559	documentation for dirstack module	2015-03-21 20:15:26 -04:00
Anthony Scopatz	b635ac23e9	fix for further nesting	2015-03-21 19:04:30 -05:00
adam j hartz	6bd814c8b9	documentation for dirstack module	2015-03-21 20:01:10 -04:00
adam j hartz	c2496fc596	use bash dirstack convention by default, and support PUSHD_MINUS	2015-03-21 19:54:46 -04:00
adam j hartz	84323fd3df	cleanup	2015-03-21 19:54:13 -04:00
Anthony Scopatz	ca6e217291	nested sets and dicts	2015-03-21 18:49:53 -05:00
Anthony Scopatz	8db48f7083	new dict nesting	2015-03-21 18:49:53 -05:00
Anthony Scopatz	b2215badd1	some nesting. some to work out	2015-03-21 18:49:53 -05:00
Anthony Scopatz	afaed78cdf	Merge branch 'wrywerytwreywery-git_branch'	2015-03-21 18:38:30 -05:00
Anthony Scopatz	e7dd4eb592	minor cond update	2015-03-21 18:38:03 -05:00
adam j hartz	7214087420	Merge branch 'dirstack' of https://github.com/wrywerytwreywery/xonsh into dirstack	2015-03-21 19:36:50 -04:00
Anthony Scopatz	df86c6740b	Merge branch 'git_branch' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-git_branch	2015-03-21 18:36:20 -05:00
adam j hartz	d17545153d	some reformatting	2015-03-21 19:28:45 -04:00
adam j hartz	a88921b866	complex number tests	2015-03-21 19:10:57 -04:00
Anthony Scopatz	c48b255d02	fix up rc to not have to end in a newline	2015-03-21 18:09:58 -05:00
adam j hartz	3cb3aeeb0e	only catch CalledProcessError when determining git branch	2015-03-21 18:58:17 -04:00
Anthony Scopatz	eab6485f6a	Merge branch 'wrywerytwreywery-string_parse'	2015-03-21 17:45:45 -05:00
adam j hartz	09df2b4c90	simpler check for executable bit	2015-03-21 16:38:55 -04:00
adam j hartz	32fc94a2ba	allow running scripts with shebang lines	2015-03-21 16:31:14 -04:00
adam j hartz	632abb9d04	fix string regex	2015-03-21 14:29:14 -04:00
adam j hartz	389c14679a	add support for imaginary numbers	2015-03-21 11:51:03 -04:00
adam j hartz	5d465e343b	remove superfluous environment variable	2015-03-20 22:43:40 -04:00
adam j hartz	b35b91b7cf	PEP8 fixes	2015-03-20 22:41:45 -04:00
adam j hartz	d4a1cdb3e1	implemented popd	2015-03-20 22:26:43 -04:00
adam j hartz	217d47dd0e	make the default aliases available to dirstack.py	2015-03-20 22:12:45 -04:00
adam j hartz	5b12120bbc	implement pushd	2015-03-20 22:12:25 -04:00
Mattias Ugelvik	d70a554468	Tabulated command suggestions, and tried to improve readability here and there	2015-03-20 23:58:47 +01:00
adam j hartz	68f5e4dba6	implemented dirs	2015-03-20 18:35:59 -04:00
adam j hartz	38ee9195e6	fallback to using git binary to determine branch when necessary	2015-03-20 17:51:14 -04:00
adam j hartz	23d5dadeed	updated documentation for new syntax	2015-03-20 17:30:24 -04:00
adam j hartz	5f0fd83a6b	Despite the new syntax, ${} should continue to do environment lookup	2015-03-20 17:29:54 -04:00
Anthony Scopatz	34c03a87a5	Merge branch 'wrywerytwreywery-string'	2015-03-20 12:02:36 -05:00
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