Changes between Version 97 and Version 98 of DeveloperGuidelines/Git


Ignore:
Timestamp:
03/31/14 20:22:13 (8 years ago)
Author:
Fran Boon
Comment:

Squashing Commits: simpler process

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v97 v98  
    179179>>>>>>> "My Changes"
    180180}}}
    181 You can correct these conflict in your code text editor, then add them andcontinue the rebase:
     181You can correct these conflict in your code text editor, then add them and continue the rebase:
    182182{{{
    183183git add -u
     
    217217
    218218==== Squashing commits ====
    219 
     219Option 1:
     220{{{
     221git log
     222# note hash of commit that you wish to squash all commits from
     223git checkout <hash>
     224git branch -b original
     225git checkout master # Assuming you're working on master
     226git rebase -i original
     227}}}
     228
     229Option 2:
    220230{{{
    221231# Stash your current work
     
    231241}}}
    232242
    233 
    234 
    235243==== Undoing a commit ====
    236244You may need to remove a commit you've made, either if you find you don't want it, or if it needs to be fixed. (Note if your commit has already been pushed to !GitHub and accepted into the trunk, then you should use a new commit to take out unwanted changes. This section only applies if you're fixing up your repository before the changes are in trunk.)
     
    281289* Optionally squash your commits.
    282290* Push your changes to !GitHub.
    283 * If your change contains more than one commit (and you are not doing a pull request yet)
     291* If your change contains more than one commit (and you are not doing a pull request yet)
     292
    284293=== Getting your changes accepted into the trunk repository ===
    285294
     
    419428git push origin master
    420429}}}
     430
    421431== Developer Configuration ==
    422 
    423432Tell git your name and email, which it uses to identify you as the author of commits.
    424433And tell it your account on !GitHub.
     
    447456An alternative to diffmerge is Perforce's free P4V:
    448457* http://danlimerick.wordpress.com/2011/06/19/git-for-window-tip-use-p4merge-as-mergetool/
     458
    449459=== Windows ===
    450460Install [http://sourceforge.net/projects/console/ Console] & [http://www.sourcegear.com/diffmerge/downloads.php Diffmerge] & [http://markembling.info/2009/09/my-ideal-powershell-prompt-with-git-integration configure Powershell].