Arthur Koziel
A fresh supply of thoughts about Web Development & Mac OS X
The git-pull command is basically a shortcut for:
git-fetch && git-merge origin
The fetch gets the changes from the remote repository, but does not merge them with your local checkout yet. You can examine these changes using origin as the reference, and merge them into your master branch.
The git-fetch part is optional. You can pass . (current directory) to it and merge local branches.
git-pull . refactor
git-merge refactor
Both commands will do the same: merge the refactor branch.
Published: May 6, 2008 — Tagged: git
Post a Comment
© 2008 Arthur Koziel — About | Archive | Colophon | Contact | Feeds
Bookmarks 
- IEBlog : IE8 Security Part IV: The XSS Filter
- IE8 will include and enable an XSS filter by default. To disable it, a custom HTTP header needs to be set.
- YAXML
- YAXML is a perl script which transforms YAML into XML and back.
- Visual language 1.0
- PDF describing the BBC.co.uk global page restructure.