Changes between Version 10 and Version 11 of GitCookbook

Show
Ignore:
Timestamp:
09/09/09 06:55:16 (5 years ago)
Author:
dukeleto
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • GitCookbook

    v10 v11  
     1= preface = 
     2 
    13Before you do anything, you should probably install the bash completion script for git, it makes the learning curve a lot less steep: 
    24http://repo.or.cz/w/git.git?a=blob;f=contrib/completion/git-completion.bash 
     5 
     6It will make your prompt be something really cool like: 
     7 
     8{{{ ~/git-svn/parrot parrotobj $ }}} 
     9 
     10where '''parrotobj''' is the name of the branch. There are many other useful setting if you read the comments in git-completion.bash . 
    311 
    412 
     
    139147{{{ git checkout -b this_branch_is_awesome }}} 
    140148 
     149= how do I get that thing over there on that onto this branch here? = 
     150 
     151Find the sha1, a single commit that you would like to "borrow" from another branch, or perhaps something you found in the '''reflog''', then type: 
     152 
     153{{{ git cherry-pick sha1 }}} 
     154 
     155If you have multiple commits to pull over, then you must do multiple cherry-pick's. 
    141156 
    142157 
    143158 
     159 
     160 
     161 
     162