Changes between Version 16 and Version 17 of GitForDarcsUsers


Ignore:
Timestamp:
Aug 13, 2008 11:19:31 PM (7 years ago)
Author:
nominolo
Comment:

start a workflow example

Legend:

Unmodified
Added
Removed
Modified
  • GitForDarcsUsers

    v16 v17  
    284284 - {{{git rerere}}}
    285285
     286== Example Workflows ==
     287
     288=== Fix a bug ===
     289{{{
     290git pull <upstream>  # get latest changes
     291git checkout -b fix_bug    # start a branch to fix the bug
     292# ... hack ...
     293git add -i           # select the proper changes
     294git diff --cached    # verify what will be committed
     295git commit
     296# ... test ... oops, forgot something
     297git add -i           # add the new patches
     298git commit --amend   # add them to previous commit
     299# ... test ... looks fine now
     300git checkout master  # back to main branch
     301git pull             # make sure it's up to date
     302git merge fix_bug    # merge in our local changes
     303# ... if we get a conflict here, edit the file then
     304# ... add the changed files with git add, then git commit
     305git push             # push changes to personal public repo
     306                     # or directly to <upstream>
     307git branch -d fix_foo # delete the branch we no longer need
     308}}}