How to pull in the latest changes made in Webkit
I have followed this instruction in setting my webkit repository locally:
http://trac.webkit.org/wiki/UsingGitWithWebKit
And then I made some changes locally.
My question is how can I sync up my repository to the master Webkit repository? I tried 'git fetch', i don't see files are added/deleted.
开发者_开发知识库And then I tried 'git pull', I do see files are added/deteted. Like this:
WebKitTools/ChangeLog | 6 +
WebKitTools/Scripts/webkitpy/committers.py | 2 +-
157 files changed, 1441 insertions(+), 1167 deletions(-)
create mode 100644 LayoutTests/fast/text/line-break-after-question-mark-expected.txt
create mode 100644 LayoutTests/fast/text/line-break-after-question-mark.html
create mode 100644 LayoutTests/fast/text/script-tests/line-break-after-question-mark.js
delete mode 100644 LayoutTests/storage/domstorage/documentURI.html
create mode 100644 LayoutTests/storage/domstorage/events/basic-body-attribute-expected.txt
git fetch
only fetches changes from remote repository, but not merge your local master
branch with remote. You can always git merge
or git rebase
to origin/master
, or do it with just one command: git pull
of git pull --rebase
.
git pull
is preffered way if you want to get changes from remote, it does fetch
and merge
.
精彩评论