Welcome to msysGit


Run 'git help git' to display the help index.
Run 'git help <command>' to display help for specific commands.

Cliente@PC11 /
$ cd /e/InstantRails2/rails_apps/adondevivir

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ git status
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#       modified:   app/models/video.rb
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       app/views/syspanel/properties_services/fotos_3d.html.erb
no changes added to commit (use "git add" and/or "git commit -a")

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ git add +
fatal: pathspec '+' did not match any files

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ git add *

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ git commit -a -m "Activacion y eliminacion de fotos 3d en servicios de propie
dades"
Created commit 216e5e9: Activacion y eliminacion de fotos 3d en servicios de pro
piedades

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ git pull
remote: Counting objects: 51, done.←[K
remote: Compressing objects: 100% (31/31), done.←[K
remote: Total 31 (delta 24), reused 0 (delta 0)←[K
Unpacking objects: 100% (31/31), done.
From git@yolavi.com:adondevivir
   34ec821..25ae63d  master     -> origin/master
fatal: cannot read object 247c8911adca0660066de5283c2a3aadb28853f8 'vendor/plugi
ns/backgroundrb~25ae63d97c23c3fd2b1fccc81d3ce5a27423d2d6'
Merge with strategy recursive failed.

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ git pull
app/controllers/home_controller.rb: needs update
app/views/layouts/home.html.erb: needs update
app/views/pages/signup.html.erb: needs update
app/views/sessions/new.html.erb: needs update
public/stylesheets/style.css: needs update
fatal: Entry 'app/controllers/home_controller.rb' not uptodate. Cannot merge.
Merge with strategy recursive failed.

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ git push
To git@yolavi.com:adondevivir.git
 ! [rejected]        master -> master (non-fast forward)
error: failed to push to 'git@yolavi.com:adondevivir.git'

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ gir log pretty=short
bash: gir: command not found

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ git log pretty=short
fatal: ambiguous argument 'pretty=short': unknown revision or path not in the wo
rking tree.
Use '--' to separate paths from revisions

Cliente@PC11 /e/InstantRails2/rails_apps/adondevivir
$ git log --pretty=short
commit 216e5e982d2e87c319333a03bd54c9525f075ac5
Author: Willy Wong <willywg@gmail.com>

    Activacion y eliminacion de fotos 3d en servicios de propiedades

commit 34ec821dd164e641b253ac77d940325f0eb9b886
Merge: 42774a4... fd054e1...
Author: Willy Wong <willywg@gmail.com>

    Merge branch 'master' of git@yolavi.com:adondevivir

commit 42774a4a68677643b86ffc9638d73236fd43af5b
Author: Willy Wong <willywg@gmail.com>

    Activacion y baja manual de servicios de panoramicas culminado

commit fd054e1f1c84c9612cde18bb2dadc89fab4f884b
Merge: 71e04f0... 2eab976...
Author: Ruben Davila Santos <ruben.grunge84@gmail.com>

    Merge branch 'master' of git@yolavi.com:adondevivir

commit 71e04f02dc2d2381decc8e0b26c4d517e74edd14
Author: Ruben Davila Santos <ruben.grunge84@gmail.com>
: