Basics

In short, the versions one has are:

• 1. in the hard-disk, whenever you change a file;
• 2. a temporary (unnamed) version, when you do git add . (valid for each of the added files);
• 3. a permanent version, each time you do git commit.

The sincronization is:

• When you do git pull, all the committed versions from the server come to your hard-disk;
• When you do git push, all the committed versions from hard-disk go to the server.

Other

• Commit your changes or stash them before you can switch branches.
• Pull request tutorial: Or how to send other user your suggestions for modifications.

Cloning a repo

cd ~
git clone https://github.com/danmoser/hello-world.git
# or you can do
git clone https://github.com/danmoser/hello-world.git destfolder

# There is a change in the website, update it to your PC ('pull'):
cd ~/hello-world
git pull
#    1 file changed, 1 insertion(+)

Create a new project

# Start a new project
cd project
git init

# to added to all files (in the current folder) to be tracked
git add .

# see status
git status

# -a/--all: Tell the command to automatically stage files that have been
# modified and deleted, but new files you have not told Git about are not affected.
git commit -am "Commit 001"

Branches

# Create and switch to a new branch
git branch develop
# List branches
git branch
git branch -v
# Switch to branch
git checkout develop

# Combining branches: NEVER rebase (unless you really know what you are doing)
# Always **merge**
# Merge branch into current (master)
git checkout master
git merge develop

# When you merge a branch you are currently merging a the commits!
# Show all commits
git log
git log --stat
git log --oneline --decorate --graph --all
# List commit id's
git log --format="%h"

# Delete branch "develop"
git branch -d develop

Merge

# Someone made a merge request (github)
# git checkout -b|-B <new_branch> [<start point>]
# Specifying -b causes a new branch to be created as if git-branch[1] were
# called and then checked out.
git checkout -b dbednarski-newest master
# Rename a branch
git branch -m dbednarski-newest beacon-dnbed
# The --no-ff flag prevents git merge from executing a "fast-forward" if it
# detects that your current HEAD is an ancestor of the commit you're trying to merge.
git checkout master
# If you find the message *you need to resolve your current index first*,
# then edit the listed files looking for the >>> <<< entries.
git merge --no-ff beacon-dnbed
git push
# git push origin master

General tips

git ignore file extensions:

vim .git/info/exclude
# More info at
git help ignore

Ignore syncing *.o (but keep then at PC):

git rm --cached *.o -n  # `-n` is the dry-run
# Use `--cached` to keep the file, or `-f` to force removal.

Roll back to a previous commit: git reset --hard f2f730b

git diff --cached f2f730b arquivo.py

Dump old version file:

git cat-file -p cf1328e:./poltools.py > poltools.old.py

Add files from a remote local:

git remote add origin https://github.com/USER/REPO.git

Upload your local commit to the web:

git push origin master

Download the changes from the repository:

git pull origin master

Texts