Diferencia entre revisiones de «Práctica 2 14-15»

De Wiki de EGC
Saltar a: navegación, buscar
(push)
Línea 55: Línea 55:
 
To git@github.com:egc-profe/test2.git
 
To git@github.com:egc-profe/test2.git
 
   9d95b3f..b32395c  master -> master
 
   9d95b3f..b32395c  master -> master
 +
</source>
 +
 +
= branch =
 +
 +
<source lang="bash">
 +
practica@LSI-160:~/test2.git$ git branch test
 +
practica@LSI-160:~/test2.git$ git branch
 +
* master
 +
  test
 +
practica@LSI-160:~/test2.git$ git checkout test
 +
Switched to branch 'test'
 +
practica@LSI-160:~/test2.git$ git branch
 +
  master
 +
* test
 +
practica@LSI-160:~/test2.git$ git checkout master
 +
Switched to branch 'master'
 +
practica@LSI-160:~/test2.git$ git branch -D test
 +
Deleted branch test (was b32395c).
 +
practica@LSI-160:~/test2.git$ git branch
 +
* master
 
</source>
 
</source>

Revisión del 20:09 22 oct 2014

init

$ git init

status

~/test2.git$ git status
# On branch master
#
# Initial commit
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	README
nothing added to commit but untracked files present (use "git add" to track)
practica@LSI-160:~/test2.git$ git add README 
practica@LSI-160:~/test2.git$ git status
# On branch master
#
# Initial commit
#
# Changes to be committed:
#   (use "git rm --cached <file>..." to unstage)
#
#	new file:   README
#

config

git config --global user.email you@example.com practica@LSI-160:~/test2.git$ git config --global user.email pneira@us.es

commit

git commit

log

git log

push

$ git push origin master
Counting objects: 5, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 329 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@github.com:egc-profe/test2.git
   9d95b3f..b32395c  master -> master

branch

practica@LSI-160:~/test2.git$ git branch test
practica@LSI-160:~/test2.git$ git branch
* master
  test
practica@LSI-160:~/test2.git$ git checkout test
Switched to branch 'test'
practica@LSI-160:~/test2.git$ git branch
  master
* test
practica@LSI-160:~/test2.git$ git checkout master
Switched to branch 'master'
practica@LSI-160:~/test2.git$ git branch -D test
Deleted branch test (was b32395c).
practica@LSI-160:~/test2.git$ git branch 
* master