Git

• git init
• git add .
• git add myFile.txt
• git commit -m "Initial Commit"
• git status
• git log

---

• git checkout myFile.txt

  Checkout a single file from a specific commit.

---

• To unstage file (that was added by git add .)

  git reset HEAD myFile.txt

  The file itself was not changed

---

• Remove all files from the staging area

  git rm --cached -r .
  -r --> recursively
  Use git status to see result
  

---

• Revert to the last good version of the file saved in the repository

  git checkout -- myFile.txt

---

• Short history

  git log --oneline --graph --decorate --all

---

• git diff myFile.txt
• Diff
  • Get short history

    git log --oneline --graph --decorate --all

  • git diff num1 HEAD

  • git diff num1 num2

  • git diff

    Diff between what's recently changed in the working directory vs. the HEAD position in the git repository

  • Diff between branches

    git diff newFeature master

    Compares between branches

---

• Diff using tool

  Same as diff, but instead of diff use difftool

  git difftool num1 HEAD

---

• To see all Git configuration

  git config --global --list

• gitignore

  # for comments

  *.txt

  build/

  /node_modules

• HEAD

  Head points to the last commit of current branch

---

• git remote

  • remote manages a remote connections from the local repositories

  • git remote ---> shows remote connections

  • git remote -v ---> shows remote connections with full locations

  • git remote add origin {url of my remote repository}

    origin is a name of the remote repository

  • git push -u origin master

    u links a local and remote repositories

    master is a name of the branch

  • git push -u origin master

    As previous, but also takes tags that exists on local repository

• To see commits

  In specific repository on GitHub, go to Insights --> Network and see commits




---

• Clone

  • Duplicate to Computer (Local Repository)

    git clone {url.git}

    git log - to see commits

  • Clone to folder with a differn name in the local machine

    git clone {url.git} myFolder




---

• Branch

• git branch ---> lists all branches, * means that it's current branch

• git checkout -b newFeature

  Create a new branch and switch to it

  ...

  git push -u origin newFeature

• git branch myBranch

• Switch to other branch git checkout master

• git branch - shows the current branch and branches of the repository

• git checkout myBranch ---> switch to this branch

• git add .
  git commit -m "my commit to branch"
  git checkout master --> to go back to the master branch

• Delete a branch

  git branch -d myBranch

• Create a new branch on GitHub

  Near the master dropdown on the main page of the repository click the down indicator

• Learn Branching

---



• Merge

  1. git checkout master --> Go back to the master branch

  2. git merge myBranch --> merge myBranch into master branch

  3. Git mergetool

  add comment about the merging

  git push origin master -u




---

• Fetch
  • git fetch

    Download contents from a remote repository

---

• Pull (its a fetch and a merge)
  • git pull

    Fetch and download content from a remote repository and immediately update the local repository to match that content

  • Pull request

    Somebody wants to merge his changes with my repository, so he creates Pull Request for me and I may merge this code into my repository.

---

• Fork

  Copy (clone) some repository under your GitHub account = to Remote Repository




---

• Tags
  • Lightway Tags

    git tag myTag

    git tag --list shows a list of tags

    git tag -d myTag delete the tag

  • Annotated (-a) tags

    git tag -a v1.0 -m "Release 1.0"

    git show v1.0

---

• git remote show origin

  Shows information

---

• --no-verify

• GitHub, SmartGit, GitExtensions