8 commits

Author	SHA1	Message	Date
Mark Griffiths	cb5c560688	Simplify styling	2014-08-01 13:25:41 +01:00
Mark Griffiths	8ac0fdfea7	Merge branch 'master' into documentation-update ... Conflicts: doc_src/history.txt doc_src/test.txt	2014-08-01 05:16:02 +01:00
Mark Griffiths	c070a2aa3e	Documentation update ... Rework for Doxygen >1.8. Moved large parts of the documentation to a simplified format, making use of Markdown enhancements and fixing bad long options.	2014-08-01 03:37:32 +01:00
ridiculousfish	e9f870e25a	Add support for history --merge to incorporate history changes from ... other sessions. Fixes #825	2014-07-25 10:49:12 -07:00
David Adam (zanchey)	1287b9d823	Help cleanup ... Large list of changes, including formatting and typos for most commands. More substantive changes have been made to alias, bind, block, break, builtin, case, cd, commandline, count, else, emit, fish_config, funced, function, functions, history, math, mimedb, nextd, not, popd, prevd, pushd, pwd, random, read, set, set_color, switch, test, trap, type, ulimit, umask, and while.	2013-05-13 01:48:20 -07:00
Siteshwar Vashisht	25f9105a97	Made history --help show history man page and history is now saved only once while deleting items	2012-06-12 14:20:07 +05:30
Torsten Grust	aad27a7a68	Fixed closing <pre> tag ... - Was an opening tag, should have been a closing tag - Confused Doxygen 1.8.1.1 on my machine (OS X 10.7), resulting in the fish man pages not being installed at all	2012-06-11 13:46:47 +02:00
Siteshwar Vashisht	ec34f2527a	Adding history builtin	2012-06-05 09:54:42 +05:30