451:bootstrap aitor$ git st
On branch encurso
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   ../_quienes-somos.html
    modified:   ../navbar.html

Untracked files:
  (use "git add <file>..." to include in what will be committed)

    ../_grupos-trabajo.html
    ../grupos.html

no changes added to commit (use "git add" and/or "git commit -a")
451:bootstrap aitor$ git add ../_quienes-somos.html
451:bootstrap aitor$ git ci -m "corrección semántica quienes somos"
[encurso d9f18c6] corrección semántica quienes somos
 1 file changed, 16 deletions(-)
451:bootstrap aitor$ git add --all
451:bootstrap aitor$ git st
On branch encurso
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   ../_grupos-trabajo.html
    modified:   less-iac/_documento.less
    modified:   less-iac/_quienes-somos.less
    new file:   ../grupos.html
    modified:   ../navbar.html

451:bootstrap aitor$ git ci -m "Grupos de trabajo"
[encurso 82a8145] Grupos de trabajo
 5 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100755 _grupos-trabajo.html
 create mode 100755 grupos.html
451:bootstrap aitor$ git st
On branch encurso
nothing to commit, working directory clean
451:bootstrap aitor$ git co master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
451:bootstrap aitor$ git mg encurso
Updating e7fca5f..82a8145
Fast-forward
 _grupos-trabajo.html                   | 115 +++++++++++++++++++++++++++++++++
 _quienes-somos.html                    |  16 -----
 bootstrap/less-iac/_documento.less     |   2 +-
 bootstrap/less-iac/_quienes-somos.less |   2 +-
 grupos.html                            |  11 ++++
 navbar.html                            |   2 +-
 6 files changed, 129 insertions(+), 19 deletions(-)
 create mode 100755 _grupos-trabajo.html
 create mode 100755 grupos.html
451:bootstrap aitor$ git st
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)
nothing to commit, working directory clean
451:bootstrap aitor$ git push
Counting objects: 12, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 2.02 KiB | 0 bytes/s, done.
Total 12 (delta 8), reused 0 (delta 0)
To git@github.com:aitormendez/iac-web.git
   e7fca5f..82a8145  master -> master
451:bootstrap aitor$ git co master
D   grupos.html
Already on 'master'
Your branch is up-to-date with 'origin/master'.
451:bootstrap aitor$ git st
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    deleted:    ../grupos.html

Untracked files:
  (use "git add <file>..." to include in what will be committed)

    ../grupos-trabajo.html

no changes added to commit (use "git add" and/or "git commit -a")
451:bootstrap aitor$ git st
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    deleted:    ../grupos.html
    modified:   ../navbar.html

Untracked files:
  (use "git add <file>..." to include in what will be committed)

    ../grupos-trabajo.html

no changes added to commit (use "git add" and/or "git commit -a")
451:bootstrap aitor$ git add --all
451:bootstrap aitor$ git ci --amend
[master 97047bb] Grupos de trabajo
 Date: Thu Nov 5 16:13:49 2015 +0100
 5 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100755 _grupos-trabajo.html
 create mode 100755 grupos-trabajo.html
451:bootstrap aitor$ git co master
Already on 'master'
Your branch and 'origin/master' have diverged,
and have 1 and 1 different commit each, respectively.
  (use "git pull" to merge the remote branch into yours)
451:bootstrap aitor$ git push
To git@github.com:aitormendez/iac-web.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:aitormendez/iac-web.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
451:bootstrap aitor$