Skip to content

Instantly share code, notes, and snippets.

@tonussi
Last active December 24, 2015 23:19
Show Gist options
  • Select an option

  • Save tonussi/6879314 to your computer and use it in GitHub Desktop.

Select an option

Save tonussi/6879314 to your computer and use it in GitHub Desktop.
output.rb
λ p5qpl-am text → λ git master* → git st
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# ../../test/
nothing added to commit but untracked files present (use "git add" to track)
λ p5qpl-am text → λ git master* → git pull https://github.com/CarlosBonetti/citygame-ruby.git master
remote: Counting objects: 12, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 8 (delta 6), reused 8 (delta 6)
Unpacking objects: 100% (8/8), done.
From https://github.com/CarlosBonetti/citygame-ruby
* branch master -> FETCH_HEAD
Merge made by the 'recursive' strategy.
src/Ataque.rb | 4 ++--
src/Tropa.rb | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
λ p5qpl-am text → λ git master* → git push
Counting objects: 17, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.19 KiB, done.
Total 11 (delta 8), reused 0 (delta 0)
To https://github.com/tonussi/citygame-ruby.git
34a6c82..fc109e9 master -> master
λ p5qpl-am text → λ git master* →
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment