Difference between revisions of "Git"

From Vague Hope Wiki
Jump to: navigation, search
Line 19: Line 19:
  
 
== References ==
 
== References ==
 +
 +
=== Merg / Rebase ===
 +
 +
* http://stackoverflow.com/questions/804115/git-rebase-vs-git-merge
 +
* [http://www.randyfay.com/node/91 A Rebase Workflow for Git]
 +
* [http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html Intro to rebase]
 +
* [http://randyfay.com/node/89 Avoiding Git Disasters]
 +
 +
=== Deploying ===
 +
 
* http://toroid.org/ams/git-website-howto
 
* http://toroid.org/ams/git-website-howto

Revision as of 04:11, 29 August 2011

Commands I keep forgetting

Update workspace (works for github):

git fetch
git merge origin/master

Tags:

git push --tags

Reset working copy:

git clean -fd
git checkout .

References

Merg / Rebase

Deploying