Xfce Wiki

Sub domains
 

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revisionBoth sides next revision
dev:howto:git [2009/08/14 00:43] – tips and tricks section moved to dev:howto:git-tips-and-tricks kelnosdev:howto:git [2009/08/14 04:23] – simplify kelnos
Line 108: Line 108:
 $ git checkout master $ git checkout master
 $ git checkout -b new-drawing $ git checkout -b new-drawing
-$ git pull ../xfdesktop.git-svn new-drawing:refs/heads/tmpbranch +$ git fetch ../xfdesktop.git-svn new-drawing:refs/heads/tmpbranch
-$ git reset --hard new-drawing+
 $ git log tmpbranch</code> $ git log tmpbranch</code>
  
Line 123: Line 122:
 <code>$ git cherry-pick d1e0179e8b6f00e4f452513c100f674f7d35dc11 <code>$ git cherry-pick d1e0179e8b6f00e4f452513c100f674f7d35dc11
 $ git cherry-pick e3633d52774bd9a2a20ef9af37d3f72f964a2f54</code> $ git cherry-pick e3633d52774bd9a2a20ef9af37d3f72f964a2f54</code>
 +
 +(Note: if there's only one commit to merge, you can skip the above and just do ''git cherry-pick tmpbranch'', which will just cherry pick the ''HEAD'' commit of ''tmpbranch''.)
  
 Now, if I got any merge errors after one of the cherry pick commands, I'd have to stop there and fix it up first: Now, if I got any merge errors after one of the cherry pick commands, I'd have to stop there and fix it up first: