Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jquery
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
jquery
Commits
ef31b678
Commit
ef31b678
authored
Jun 05, 2012
by
Rick Waldron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds "grunt submodules" docs to readme, removes old make command docs
Signed-off-by:
Rick Waldron
<
waldron.rick@gmail.com
>
parent
655350be
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
16 deletions
+12
-16
README.md
README.md
+12
-16
No files found.
README.md
View file @
ef31b678
...
@@ -56,7 +56,7 @@ Make sure you have `grunt` installed by testing:
...
@@ -56,7 +56,7 @@ Make sure you have `grunt` installed by testing:
Then, to get a complete, minified (w/ Ugligy.js), linted (w/ JSHint) version of jQuery, type the following:
Then, to get a complete, minified (w/ Ugligy.js), linted (w/ JSHint) version of jQuery, type the following:
`grunt`
#### `grunt` ####
The built version of jQuery will be put in the
`dist/`
subdirectory.
The built version of jQuery will be put in the
`dist/`
subdirectory.
...
@@ -99,6 +99,17 @@ With this example, the output files would be:
...
@@ -99,6 +99,17 @@ With this example, the output files would be:
```
```
Updating Submodules
-------------------
Update the submodules to what is probably the latest upstream code.
#### `grunt submodules` ####
Note: This task will also be run any time the default
`grunt`
command is used.
Git for dummies
Git for dummies
---------------
---------------
...
@@ -139,21 +150,6 @@ but remember to push the submodule changes before pushing the new jquery commit:
...
@@ -139,21 +150,6 @@ but remember to push the submodule changes before pushing the new jquery commit:
4.
`git add src/sizzle`
4.
`git add src/sizzle`
5.
`git commit`
5.
`git commit`
The makefile has some targets to simplify submodule handling:
#### `make update_submodules` ####
checks out the commit pointed to by jquery, but merges your local changes, if any. This target is executed
when you are doing a normal
`make`
.
#### `make pull_submodules` ####
updates the content of the submodules to what is probably the latest upstream code.
#### `make pull` ####
make a
`make pull_submodules`
and after that a
`git pull`
. if you have no remote tracking in your master branch, you can
execute this command as
`make pull REMOTE=origin BRANCH=master`
instead.
### cleaning ###
### cleaning ###
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment