Git

Front 1

Remove files from the working tree and from the index

Back 1

git-rm

git rm will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use /bin/rm if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the -f option.

Front 2

Store dirty changes

Back 2

git stash

git stash apply

git stash apply stash@{2}

If you don’t specify a stash, Git assumes the most recent stash and tries to apply it

Having a clean working directory and applying it on the same branch aren’t necessary to successfully apply a stash. You can save a stash on one branch, switch to another branch later, and try to reapply the changes. You can also have modified and uncommitted files in your working directory when you apply a stash — Git gives you merge conflicts if anything no longer applies cleanly.

Front 3

To see which stashes you’ve stored

Back 3

git stash list

stash@{0}: WIP on master: 049d078 added the index file

stash@{1}: WIP on master: c264051 Revert "added file_size"

stash@{2}: WIP on master: 21d80a5 added number to log

Front 4

Remove from stash

Back 4

git stash drop stash@{0}

You can also run git stash pop to apply the stash and then immediately drop it from your stack

Front 5

Un-applying a Stash

Back 5

git stash show -p stash@{0} | git apply -R

Front 6

Reapply commits on top of another base tip

Back 6

git-rebase

Front 7

Switch branches or restore working tree files

Back 7

git checkout

Front 8

Download objects and refs from another repository

Back 8

git fetch

git fetch can fetch from either a single named repository or URL, or from several repositories at once if is given and there is a remotes. entry in the configuration file. (See git-config[1]).

When no remote is specified, by default the origin remote will be used, unless there’s an upstream branch configured for the current branch.

Front 9

See log history

Back 9

git log

Front 10

Initialize repository

Back 10

git init

Front 11

git fetch vs git pull

Back 11

git pull does a git fetch followed by a git merge.

You can do a git fetch at any time to update your remote-tracking branches under refs/remotes//.

This operation never changes any of your own local branches under refs/heads, and is safe to do without changing your working copy. I have even heard of people running git fetch periodically in a cron job in the background (although I wouldn't recommend doing this).

A git pull is what you would do to bring a local branch up-to-date with its remote version, while also updating your other remote-tracking branches.

Front 12

Send changes

Back 12

git push origin master

where master is the branch you want to send your changes to

Front 13

Connect an existing local repo to a remote repo

Back 13

git remote add origin <server>

origin is the name you give to the remote (aka GitHub)

git push origin master is the same as git push origin master_on_my_machine:master_on_github

Si no has clonado un repositorio ya existente y quieres conectar tu repositorio local a un repositorio remoto, usa git remote add origin Ahora podrás subir tus cambios al repositorio remoto seleccionado.

Front 14

Create new branch and change to it

Back 14

git checkout -b [name_of_your_new_branch]

Shorthand for

$ git branch iss53

$ git checkout iss53

Push the branch on github :

$ git push origin [name_of_your_new_branch]

When you want to commit something in your branch, be sure to be in your branch.

Front 15

Delete branch

Back 15

Delete a branch on your local filesystem :

$ git branch -d [name_of_your_new_branch]

To force the deletion of local branch on your filesystem :

$ git branch -D [name_of_your_new_branch]

Delete the branch on github :

$ git push origin :[name_of_your_new_branch]

Front 16

check which files of your local repo have been modified

Back 16

git status

Front 17

See all branches

Back 17

git branch

Front 18

reemplazar cambios locales

Back 18

git checkout -- <filename>

git checkout master

Este comando reemplaza los cambios en tu directorio de trabajo con el último contenido de HEAD. Los cambios que ya han sido agregados al Index, así como también los nuevos archivos, se mantendrán sin cambio.

Front 19

traer la última versión del servidor y apuntar a tu copia local principal de esta forma

Back 19

git fetch origin

git reset --hard origin/master

Front 20

Create tag 1.0.0

Back 20

git tag 1.0.0 1b2e1d63ff

1b2e1d63ff se refiere a los 10 caracteres del commit id al cual quieres referirte con tu etiqueta.

Front 21

overwriting committed snapshots: fix up the most recent commit.

Back 21

git commit --amend