- Getting started
- Setup
- Configuration files
- Create
- Local Changes
- Commit History
- Branches
- Tags
- Update & Publish
- Merge & Rebase
- Undo
- .gitignore Rules
Basic GIT Syntax:
git [command] [--flags] [arguments]
Getting help:
git help [command]
Example:
git help push
Show current config:
git config --list
git config [--local|--global|--system] --list
Set username
git config --global user.name "[firstname lastname]"
Set email address
git config --global user.emal "[your email]"
Set automatic command line coloring for GIT for easy reviewing
git config --global color.ui auto
Set global editor for commit
git config --global core.editor vi
Repository specific configuration file (--local)
<repo>/.git/config
User-specific configuration file (--global)
~/.gitconfig
System-wide configuration fiel (--system)
/etc/gitconfig
Clone an existing repository
git clone ssh://[email protected]/repo.git
git clone http://domain.com/user/repo.git
Create a new local repository in the current directory
git init
Create a new local repository in a specific directory
git init <directory>
Show changes in working directory
Untracked files (RED) - tracked files (GREEN)
git status
Changes to tracked files
git diff
Changes for a specific file
git diff <file>
Add all changes to the next commit
git add .
Add only the mentioned files to the next commit
git add <file1> <file2> <...>
Commit all local changes in tracked files
git commit -a
Commit previously staged changes
git commit
Commit with message
git commit -m "<your message>"
Commit skipping the staging area and adding message
git commit -am "<your message>"
Change last commit
git commit -a --amend
Move uncommitted changes from current branch to some other branch
git stash
git checkout brach2
git stash pop
Restore stashed changes back to current brach
git stash apply
Restore particular stash back to current branch
{stash number} can be obtained from git stash list
git stash apply stash@{<stash number>}
Remove the last set of stashed changes
git stash drop
Show all commits starting with the newest
git log
Condensed version of git log
git log --online
Show only the x-newest commits
git log --online -<no_of_commits>
Show changes over time for a specific file
git log -p <file>
Show who modified a specific file
git blame <file>
Show reference log
git reflog show
Delete reference log
git reflog delete
List all local branches
git branch
List all remote branches
git branch -r
List local/remote branches
git branch -a
Create a new branch (no checkout)
git branch <branchname>
Create and switch new branch
git checkout -b <branchname>
Switch HEAD branch
git checkout <branchname>
Checkout single file from different branch
git checkout <branchname> -- <filename>
Switch th previous branch, without saying the name explicitly
git checkout -
Create new branch from existing branch and switch to new branch
git checkout -b <new_branch> <existing_branch>
Checkout and create new branch from existing commit
git checkout <commit_hash> -b <branchname>
Rename current branch to new branch name
git branch -m <new_branch_name>
Delete a local branch (only if merged)
git branch -d <branchname>
Force delete a local branch
git branch -D <branchname>
Create tag on HEAD reference
git tag <tagname>
Create tag on HEAD reference and open editor to include a message
git tag -a <tagname>
Create tag on HEAD reference and include a message
git tag -a <tagname> -m "<your message>"
Create a lightweight tag
git tag <tagname>-lw
List all tags
git tag
List all tags with messages
git tag -n
Tag old commit
git tag -a <tagname> <commit_hash>
Force to switch commit tag
git tag -a -f <tagname> <commit_hash>
Delete a tag
git tag -d <tagname>
Show configured remotes
git remote -v
Show information about a remote
git remote show <remote>
Add new remote repository, named < remote >
git remote add <remote> <url>
Rename a remote repository
git remote rename <old_name> <new_name>
Remove a remote (only from your local repository)
git remote rm <remote>
Download remote, but don´t integrate into HEAD
git fetch <remote>
Download remote and merge/integrate into HEAD
git remote pull <remote> <url>
Get all changes from HEAD to local repository
git pull origin master
Get all changes from HEAD to local repository without a merge
git pull --rebase <remote> <branch>
Publish local changes to remote
git push <remote> <branch>
Delete a branch on the remote
git push <remote> --delete <branch>
Publish a single tag
git push <remote> <tagname>
Publish all tags
git push <remote> --tags
Before
D --- E (feature_branch)
/
A --- B --- C (master)
After
A --- B --- C --- D --- E (master)
Condition: Possible if no other commits have been made to the base branch since branching.
The example below is not working because since commit A another commit D with HEAD reference was made.
B --- C (feature_branch)
/
A --- D (master)
Performing a Fast-Forward-Merge and delete feature_branch afterwards
git checkout master
git merge feature_branch
git branch -d feature_branch
Performing a Fast-Forward-Merge with merge commit
git checkout master
git merge --no-ff feature_branch
git branch -d feature_branch
Before
B --- C (feature_branch)
/
A (master)
After
B --- C
/ \
A ------- D (master)
A 3-Way-Merge is used if the Fast-Forward-Mege is not possible because branches diverged.
Before
D --- E (feature_branch)
/
A --- B --- C (master)
After
D --- E
/ \
A --- B --- F --- C (master)
Recursive
git merge -s recursive <branch1> <branch2>
This operates on two heads. Recursive is the default merge strategy when pulling or merging one branch. Additionally this can detect and handle merges involving renames, but currently cannot make use of detected copies. This is the default merge strategy when pulling or merging one branch.
Resolve
git merge -s resolve <branch1> <brach2>
This can only resolve two heads using a 3-way merge. It tries to carefully cris-cross merge ambiguities and is considered generally safe and fast.
Octopus
git merge -s octopus <branch2> <branch2> <branch3> <branchN>
The default merge strategy for more than two heads. When more than one branch is passed octopus is automatically engaged. If a merge has conflicts that need manual resolution octopus will refuse the merge attempt. It is primarily used for bundling similar feature branch heads together.
Ours
git merge -s ours <branch2> <branch2> <branchN>
The ours strategy operates on multiple N number of branches. The output result is always that of the current branch HEAD. The "ours" term implies the preference effectively ignoring all changes from all other branches. It is intended to be used to combine history of similar feature branches.
Subtree
git merge -s subtree <branch1> <branch2>
This is an extension of the recursive strategy. When merging and , if is a child subtree of , is first updated to reflect the tree structure of . This update is also done to the common ancestor tree that is shared between and .
List merged branches
git branch --merged
Moves commits to a new parent (base)
Before
B --- C
/
A --- D
After
B` --- C`
/
A --- D
Rebase the current HEAD into <feature_branch>
git rebase <feature_branch>
Abort a rebase
git rebase --abort
Continue a rebase after resolving conflicts
git rebase --continue
Using editor to manually solve conflicts and (after resolving) mark file as resolved
git add <resolved_file>
git rm <resolved_file>
Squashing commits
git rebase -i <commit-just-before-first>
Replace
pick <commit_id>
pick <commit_id2>
pick <commit_id3>
to
pick <commit_id>
squash <commit_id2>
squash <commit_id2>
Discard all local changes in working directory
git reset --hard HEAD
Get all files out of the staging area (i.e. undo the last git add)
git reset HEAD
Discard local changes in a specific file
git checkout HEAD <file>
Revert a commit (by producing a new commit with contrary changes)
git revert <commit>
Reset HEAD pointer to a previous commit and discard all changes since then
git reset --hard <commit>
Reset HEAD pointer to a remote branch current-state (e.g. upstream/master, origin/my-feature)
git reset --hard <remote/branch>
Reset HEAT pointer to a previous commit and preserve all changes as unstaged changes
git reset <commit>
Reset HEAD pointer to previous commit and preserve uncommited local changes
git reset --keep <commit>
Remove files that were accidentally commited before they were added to .gitignore
git rm -r --cached .
git add .
git commit -m "remove file>
| Pattern | Explanation/Matches | Examples |
|---|---|---|
| Blank lines are ignored | ||
| # text comment | Lines starting with # are ignored | |
| name | All name files, name folders, and files and folders in any name folder | /name.log /name/file.txt /lib/name.log |
| name/ | Ending with / specifies the pattern is for a folder. Matches all files and folders in any name folder | /name/file.txt /name/log/name.log no match: /name.log |
| name.file | All files with the name.file | /name.file /lib/name.file |
| /name.file | Starting with / specifies the pattern matches only files in the root folder | /name.file no match: /lib/name.file |
| lib/name.file | Patters specifiing files in specific folders are always relative to root (even if you do not start with /) | /lib/name.file no match: name.file /test/lib/name.file |
| **/lib/name.file | Starting with ** before / specifies that it matches any folder in the repository. Not just on root | /lib/name.file /test/lib/name.file |
| **/name | All name folders, and files and folders in any name folder | /name/log.file /lib/name/log.file /name/lib/log.file |
| /lib/**/name | All name folders, and files and folders in any name folder within the lib folder | /lib/name/log.file /lib/test/name/log.file /lib/test/ver1/name/log.file no match: /name/log.file |
| *.file | All files with the .file extention | /name.file /lib/name.file |
| *name/ | All folders ending with *name | /lastname/log.file /firstname/log.file |
| name?.file | ? matches a single non-specific character | /names.file /name1.file no match: /names1.file |
| name[a-z].file | [range] matches a single character in the specified range (in this case a character in the range of a-z, and also be numeric | /names.file /nameb.file no match: /name1.file |
| name[abc].file | [set] matches a single character in the specified set of characters (in this case either a, b, or c) | /namea.file /nameb.file no match: /name1.file |
| name[!abc].file | [!set] matches a single character, except the ones specified in the set of characters (in this case a, b, or c) | /names.file /namex.file no match: /namesb.file |
| *.file | All files with .file extension | /name.file /lib/name.file |
| name/ !name/secret.log |
! specifies a negation or exception. Matches all files and folders in any name folder except name/secret.log | /name/file.txt /name/log/name.log no match: /name/secret.log |
| *.file !name.file |
! specifies a negation or exception. All files with .file extension, except name.file | /log.file /lastname.file no match: /name.file |
| *.file !name/*.file junk.* |
Adding new patterns after a negation will re-ignore a previous negated file. All files with .file extension, except the ones in name folders. Unless the file name is junk | /log.file /name/log.file no match: /name/junk.file |