Created
March 23, 2012 01:22
-
-
Save cowboy/2166006 to your computer and use it in GitHub Desktop.
git merge noglobals (just a few changes)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Updating a0dfb40..cafc7f3 | |
| Checking out files: 100% (73/73), done. | |
| Fast-forward | |
| docs/api.md | 402 ++++++++++- | |
| docs/api_config.md | 94 +++ | |
| docs/api_fail.md | 35 + | |
| docs/api_file.md | 161 ++++ | |
| docs/api_log.md | 120 +++- | |
| docs/api_task.md | 416 +++++++++++ | |
| docs/api_template.md | 72 ++ | |
| docs/api_utils.md | 126 ++++ | |
| docs/configuring.md | 106 --- | |
| docs/example_gruntfiles.md | 2 +- | |
| docs/getting_started.md | 138 ++++ | |
| docs/helpers_directives.md | 37 +- | |
| docs/{tasks_builtin.md => plugins.md} | 4 +- | |
| docs/task_concat.md | 95 ++- | |
| docs/task_init.md | 4 +- | |
| docs/task_lint.md | 79 ++- | |
| docs/task_min.md | 177 +++++ | |
| docs/task_qunit.md | 57 +- | |
| docs/task_server.md | 56 ++- | |
| docs/toc.md | 24 +- | |
| docs/{tasks_creating.md => types_of_tasks.md} | 4 +- | |
| grunt.js | 87 ++-- | |
| lib/grunt.js | 92 ++-- | |
| lib/grunt/cli.js | 75 ++- | |
| lib/grunt/config.js | 102 ++-- | |
| lib/grunt/fail.js | 41 +- | |
| lib/grunt/file.js | 238 ++---- | |
| lib/grunt/help.js | 46 +- | |
| lib/grunt/log.js | 86 ++- | |
| lib/grunt/option.js | 14 +- | |
| lib/grunt/task.js | 298 ++++++--- | |
| lib/grunt/template.js | 49 +- | |
| lib/grunt/utils.js | 66 +- | |
| lib/util/task.js | 13 +- | |
| tasks/concat.js | 66 +- | |
| tasks/init.js | 968 ++++++++++++------------ | |
| tasks/init/commonjs.js | 42 +- | |
| tasks/init/commonjs/root/README.md | 2 +- | |
| tasks/init/commonjs/root/grunt.js | 110 ++-- | |
| tasks/init/commonjs/root/lib/name.js | 2 +- | |
| tasks/init/gruntplugin.js | 40 +- | |
| tasks/init/gruntplugin/root/README.md | 2 +- | |
| tasks/init/gruntplugin/root/bin/name | 3 +- | |
| tasks/init/gruntplugin/root/grunt.js | 82 +-- | |
| tasks/init/gruntplugin/root/tasks/name.js | 44 +- | |
| tasks/init/gruntplugin/root/test/name_test.js | 4 +- | |
| tasks/init/jquery.js | 38 +- | |
| tasks/init/jquery/root/README.md | 2 +- | |
| tasks/init/jquery/root/grunt.js | 109 ++-- | |
| tasks/init/jquery/root/src/name.js | 2 +- | |
| tasks/init/jquery/root/test/name_test.js | 6 +- | |
| tasks/init/licenses/LICENSE-MIT | 2 +- | |
| tasks/init/node.js | 42 +- | |
| tasks/init/node/root/README.md | 2 +- | |
| tasks/init/node/root/grunt.js | 68 +- | |
| tasks/init/node/root/lib/name.js | 2 +- | |
| tasks/lint.js | 261 ++++---- | |
| tasks/min.js | 150 ++-- | |
| tasks/misc.js | 124 ++-- | |
| tasks/qunit.js | 443 ++++++------ | |
| tasks/server.js | 78 ++- | |
| tasks/test.js | 275 ++++---- | |
| tasks/watch.js | 279 ++++---- | |
| test/fixtures/banner3.js | 10 + | |
| test/grunt/file_test.js | 9 +- | |
| test/grunt/template_test.js | 21 + | |
| test/grunt/utils_test.js | 3 + | |
| test/tasks/concat_test.js | 7 +- | |
| test/tasks/init_test.js | 34 +- | |
| test/tasks/misc_test.js | 57 ++- | |
| test/util/task_test.js | 10 +- | |
| 71 files changed, 4455 insertions(+), 2360 deletions(-) | |
| create mode 100644 docs/api_config.md | |
| create mode 100644 docs/api_fail.md | |
| create mode 100644 docs/api_file.md | |
| create mode 100644 docs/api_task.md | |
| create mode 100644 docs/api_template.md | |
| create mode 100644 docs/api_utils.md | |
| delete mode 100644 docs/configuring.md | |
| create mode 100644 docs/getting_started.md | |
| rename docs/{tasks_builtin.md => plugins.md} (74%) | |
| create mode 100644 docs/task_min.md | |
| rename docs/{tasks_creating.md => types_of_tasks.md} (99%) | |
| create mode 100644 test/fixtures/banner3.js | |
| create mode 100644 test/grunt/template_test.js |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment