gistfile1

## Why a proper DVCS is awesome.


[0:538] callisto:Pong $ git remote add upstream https://github.com/Knifa/Pong.git


[0:540] callisto:Pong $ git pull upstream master
From https://github.com/Knifa/Pong
 * branch            master     -> FETCH_HEAD
Merge made by recursive.
 src/pong/Ball.java           |   81 ++++++++++++++++++++++++++++++++++++++++++
 src/pong/ComputerPaddle.java |   17 +++++++++
 src/pong/Entity.java         |   20 ++++++++++
 src/pong/Game.java           |   57 +++++++++++++++++++++++++-----
 src/pong/Paddle.java         |   41 +++++++++++++++++++++
 src/pong/PlayerPaddle.java   |   20 ++++++++++
 src/pong/Point.java          |   19 ++++++++++
 7 files changed, 246 insertions(+), 9 deletions(-)
 create mode 100644 src/pong/Ball.java
 create mode 100644 src/pong/ComputerPaddle.java
 create mode 100644 src/pong/Entity.java
 create mode 100644 src/pong/Paddle.java
 create mode 100644 src/pong/PlayerPaddle.java
 create mode 100644 src/pong/Point.java


[0:541] callisto:Pong $ git checkout ivy-branch
Switched to branch 'ivy-branch'


[0:542] callisto:Pong $ git merge master
Merge made by recursive.
 src/pong/Ball.java           |   81 ++++++++++++++++++++++++++++++++++++++++++
 src/pong/ComputerPaddle.java |   17 +++++++++
 src/pong/Entity.java         |   20 ++++++++++
 src/pong/Game.java           |   57 +++++++++++++++++++++++++-----
 src/pong/Paddle.java         |   41 +++++++++++++++++++++
 src/pong/PlayerPaddle.java   |   20 ++++++++++
 src/pong/Point.java          |   19 ++++++++++
 7 files changed, 246 insertions(+), 9 deletions(-)
 create mode 100644 src/pong/Ball.java
 create mode 100644 src/pong/ComputerPaddle.java
 create mode 100644 src/pong/Entity.java
 create mode 100644 src/pong/Paddle.java
 create mode 100644 src/pong/PlayerPaddle.java
 create mode 100644 src/pong/Point.java
[0:543] callisto:Pong $ 


[0:543] callisto:Pong $ ls -lah
total 56K
drwxr-xr-x  8 supernaut supernaut 4,0K 2011-02-19 01:14 .
drwxr-xr-x 33 supernaut supernaut 4,0K 2011-02-17 11:52 ..
drwxr-xr-x  2 supernaut supernaut 4,0K 2011-02-17 02:03 build
-rw-r--r--  1 supernaut supernaut 5,8K 2011-02-19 01:14 build.xml
drwxr-xr-x  2 supernaut supernaut 4,0K 2011-02-17 02:03 dist
drwxr-xr-x  3 supernaut supernaut 4,0K 2011-02-17 19:17 doc
drwxr-xr-x  8 supernaut supernaut 4,0K 2011-02-19 01:14 .git
-rw-r--r--  1 supernaut supernaut   33 2011-02-17 04:46 .gitignore
drwxr-xr-x  4 supernaut supernaut 4,0K 2011-02-17 19:38 .ivy
-rw-r--r--  1 supernaut supernaut 1,1K 2011-02-19 01:14 ivy.xml
-rw-r--r--  1 supernaut supernaut 5,9K 2011-02-17 04:41 README.rst
drwxr-xr-x  3 supernaut supernaut 4,0K 2011-02-17 02:03 src


[0:545] callisto:Pong $ ls -lah src/pong/
total 40K
drwxr-xr-x 2 supernaut supernaut 4,0K 2011-02-19 01:14 .
drwxr-xr-x 3 supernaut supernaut 4,0K 2011-02-17 02:03 ..
-rw-r--r-- 1 supernaut supernaut 2,6K 2011-02-19 01:14 Ball.java
-rw-r--r-- 1 supernaut supernaut  293 2011-02-19 01:14 ComputerPaddle.java
-rw-r--r-- 1 supernaut supernaut  474 2011-02-19 01:14 Entity.java
-rw-r--r-- 1 supernaut supernaut 3,3K 2011-02-19 01:14 Game.java
-rw-r--r-- 1 supernaut supernaut 1,4K 2011-02-19 01:14 Paddle.java
-rw-r--r-- 1 supernaut supernaut  659 2011-02-19 01:14 PlayerPaddle.java
-rw-r--r-- 1 supernaut supernaut  340 2011-02-19 01:14 Point.java
-rw-r--r-- 1 supernaut supernaut  413 2011-02-17 02:03 Utils.java
[0:546] callisto:Pong $ 



[0:544] callisto:Pong $ git push
Counting objects: 7, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 582 bytes, done.
Total 4 (delta 2), reused 0 (delta 0)
To [email protected]:mrdaemon/Pong.git
   291e51e..785b48e  ivy-branch -> ivy-branch
   bc7109c..c6c0de0  master -> master
[0:545] callisto:Pong $