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
2d27ac4d
Commit
2d27ac4d
authored
Apr 12, 2011
by
jeresig
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/robmorgan/jquery
into robmorgan-master
parents
0fa0f4cf
91d03988
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
README.md
README.md
+4
-4
No files found.
README.md
View file @
2d27ac4d
...
@@ -63,7 +63,7 @@ As the source code is handled by the version control system Git, it's useful to
...
@@ -63,7 +63,7 @@ As the source code is handled by the version control system Git, it's useful to
### Submodules ###
### Submodules ###
The repository uses submodules, which normally are handle
s
directly by the Makefile, but sometimes you want to
The repository uses submodules, which normally are handle
d
directly by the Makefile, but sometimes you want to
be able to work with them manually.
be able to work with them manually.
Following are the steps to manually get the submodules:
Following are the steps to manually get the submodules:
...
@@ -86,7 +86,7 @@ If you want to work inside a submodule, it is possible, but first you need to ch
...
@@ -86,7 +86,7 @@ If you want to work inside a submodule, it is possible, but first you need to ch
1.
`cd src/sizzle`
1.
`cd src/sizzle`
2.
`git checkout master`
2.
`git checkout master`
After you've commited your changes to the submodule, you'll update the jquery project to point to the new commit,
After you've commit
t
ed your changes to the submodule, you'll update the jquery project to point to the new commit,
but remember to push the submodule changes before pushing the new jquery commit:
but remember to push the submodule changes before pushing the new jquery commit:
1.
`cd src/sizzle`
1.
`cd src/sizzle`
...
@@ -99,12 +99,12 @@ The makefile has some targets to simplify submodule handling:
...
@@ -99,12 +99,12 @@ The makefile has some targets to simplify submodule handling:
#### `make update_submodules` ####
#### `make update_submodules` ####
checks out the commit pointed to by
u
jquery, but merges your local changes, if any. This target is executed
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`
.
when you are doing a normal
`make`
.
#### `make pull_submodules` ####
#### `make pull_submodules` ####
updates the content of the submodu
els to what is probably the latest upstream code
updates the content of the submodu
les to what is probably the latest upstream code.
#### `make pull` ####
#### `make pull` ####
...
...
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