2. Already on 'greet'
    3. $ git hist
    4. *   25f0e8c 2013-04-13 | Merged master fixed conflict. (HEAD, greet) [Jim Weirich]
    5. |\  
    6. | * 05f32c0 2013-04-13 | Made interactive (master) [Jim Weirich]
    7. * |   844d1ed 2013-04-13 | Merge branch 'master' into greet [Jim Weirich]
    8. |\ \  
    9. | |/  
    10. | * b59a8c2 2013-04-13 | Added README [Jim Weirich]
    11. * | 4dac415 2013-04-13 | Hello uses Greeter [Jim Weirich]
    13. |/  
    14. * 96ee164 2013-04-13 | Added a Rakefile. [Jim Weirich]
    15. * 0f36766 2013-04-13 | Moved hello.rb to lib [Jim Weirich]
    16. * eb30103 2013-04-13 | Add an author/email comment [Jim Weirich]
    17. * 1f7ec5e 2013-04-13 | Added a comment (v1) [Jim Weirich]
    18. * 582495a 2013-04-13 | Added a default value (v1-beta) [Jim Weirich]
    19. * 323e28d 2013-04-13 | Using ARGV [Jim Weirich]
    20. * 9416416 2013-04-13 | First Commit [Jim Weirich]
    1. $ git reset --hard 28917a4
    2. HEAD is now at 28917a4 Updated Rakefile

    检查分支

    2. * b59a8c2 2013-04-13 | Added README [Jim Weirich]
    3. | * 28917a4 2013-04-13 | Updated Rakefile (HEAD, greet) [Jim Weirich]
    4. | * 4dac415 2013-04-13 | Hello uses Greeter [Jim Weirich]
    5. | * 39347b3 2013-04-13 | Added greeter class [Jim Weirich]
    6. |/  
    7. * 96ee164 2013-04-13 | Added a Rakefile. [Jim Weirich]
    8. * 0f36766 2013-04-13 | Moved hello.rb to lib [Jim Weirich]
    9. * eb30103 2013-04-13 | Add an author/email comment [Jim Weirich]
    10. * 1f7ec5e 2013-04-13 | Added a comment (v1) [Jim Weirich]
    11. * 582495a 2013-04-13 | Added a default value (v1-beta) [Jim Weirich]
    12. * 323e28d 2013-04-13 | Using ARGV [Jim Weirich]