daily pastebin goal
67%
SHARE
TWEET

Untitled

a guest Jan 12th, 2018 62 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. 17:49 ~/git/r (feature/resetball)$ git commit -a
  2. [feature/resetball fb0fda3] Implemented resetting of the ball.
  3.  6 files changed, 732 insertions(+), 673 deletions(-)
  4. 17:49 ~/git/r (feature/resetball)$ git flow feature finish resetball
  5. Switched to branch 'develop'
  6. Updating e683166..fb0fda3
  7. Fast-forward
  8.  pinball.json    | 1374 ++++++++++++++++++++++++++++---------------------------
  9.  src/box.cpp     |    2 -
  10.  src/box.h       |    5 +-
  11.  src/collide.cpp |    5 +
  12.  src/game.cpp    |   17 +
  13.  src/game.h      |    2 +
  14.  6 files changed, 732 insertions(+), 673 deletions(-)
  15. Deleted branch feature/resetball (was fb0fda3).
  16.  
  17. Summary of actions:
  18. - The feature branch 'feature/resetball' was merged into 'develop'
  19. - Feature branch 'feature/resetball' has been removed
  20. - You are now on branch 'develop'
  21.  
  22. 17:49 ~/git/r (develop)$
RAW Paste Data
Top