Repository - A set of files, directories, historical records, commits, and heads. Imagine it as a source code data structure, with the attribute that each source code “element” gives you access to its revision history, among other things.

.git folder - all git configs

.gitignore - file, add what you do not want to be tracked by git (user generated)

your own files and folders

.gitignore file contents

									
																					# Compiled source #
											###################
											*.com
											*.class
											*.dll
											*.exe
											*.o
											*.so
											
											# Packages #
											############
											# it's better to unpack these files and commit the raw source
											# git has its own built in compression methods
											*.7z
											*.dmg
											*.gz
											*.iso
											*.jar
											*.rar
											*.tar
											*.zip
											
											# Logs and databases #
											######################
											*.log
											*.sql
											*.sqlite
											
											# OS generated files #
											######################
											.DS_Store
											.DS_Store?
											._*
											.Spotlight-V100
											.Trashes
											ehthumbs.db
											Thumbs.db
										
									
								

• modified - file/folder is tracked by git and got modified
• staged - mark the changes for a commit
• commited - all changes got commited (snapshot)

• commit - snapshot of changes inside working directory (checksum)
• branch - a collection of commits (you can have multiple branches with different commits)
• tag - A tag is a mark on specific point in history
• HEAD - is a pointer to the current branch

									
																					git init - start a git repo (we don't actually use this because we usually use: gitlab, bitbucket or github and these
											sites will create our git repo for us)
											git clone git@github.com:ciprian-chichirita/presentations.git
											git checkout -b "cc/presentations"
											git checkout master
											git pull
										
									
								

									
																					git branch
											git branch -r
										
									
								

									
																					git status
											git diff
											git log
										
									
								

									
																					git add
											git add .
											git add --all
										
									
								

									
																					git commit
											git commit -m "initial commit"
											git commit --amend -m "Initial Commit"
										
									
								

									
																					git push
											git merge master
										
									
								

									
																					git rebase master
											git rebase -i commit-checksum(sha string)
											git rebase -i master
										
									
								

									
																					git stash
											git stash list
											git stash pop
											git stash apply stash@{0}
											git stash drop stash@{0}
										
									
								

									
																					# Reset the staging area, to match the latest commit, and overwrite working dir
											git reset --hard || --soft || --mixed
											git reset HEAD -- fileA
										
									
								

									
																					# List tags
											git tag
											# Create a annotated tag
											# The -m specifies a tagging message, which is stored with the tag.
											# If you don’t specify a message for an annotated tag,
											# Git launches your editor so you can type it in.
											$ git tag -a v2.0 -m 'my version 2.0'
											
											# Show info about tag
											# That shows the tagger information, the date the commit was tagged,
											# and the annotation message before showing the commit information.
											$ git show v2.0
											
											# Push a single tag to remote
											$ git push origin v2.0
											
											# Push a lot of tags to remote
											$ git push origin --tags
										
									
								

Git Basics Git Aliases

									
																					$ git config --global alias.co checkout
											$ git config --global alias.br branch
											$ git config --global alias.ci commit
											$ git config --global alias.st status
										
									
								

									
																					$ git config --global alias.unstage 'reset HEAD --'
											# This makes the following two commands equivalent:
											$ git unstage fileA
											$ git reset HEAD -- fileA