git commands - florida state universitybaker/swe2/restricted/notes/gitcommands.pdfbasic model...

Git commands

These slides have been reformatted from Mark Lodato’s http://marklodato.github.com/visual-git-guide/index-svg.html

Basic model

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

h"p://osteele.com/images/2008/git‐transport.png

Git object model

h"p://utsl.gen.nz/talks/git‐svn/git‐model.png

Elements of diagrams

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

diff

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

commit

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

commit below HEAD

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

commit --amend

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

checkout

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

checkout that moves HEAD

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

commit with detached HEAD

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

losing a commit

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

avoiding loss of commit

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

reset

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

reset with no commit

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

reset with filename

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

merge

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html

“recursive” merge

h"p://marklodato.github.com/visual‐git‐guide/index‐svg.html