Git

CLI

# show repository info
git describe
git config -l
 
# show commit info
git show <commit-id>
 
# show diff for one file
git diff <FILE>
 
# commit only one file
git commit -m 'my comment' path/to/file
 
# create Git repository
git init
 
# add all files
git add .
 
# commit
git commit -m "initial project version"
 
# list tag
git tag -l

checkout

# checkout over SSH
git clone git@github.com:foo/bar.git
 
# pull single file
git checkout filename
 
# pull single file from remote
git checkout origin/master -- path/to/file
# pull all files from remote
git checkout origin/dev -- .
 
# sync changes from other branch
git rebase master
git rebase brach1
 
# checkout to checkout to specific folder
git clone https://github.com/panticz/installit.git /path/to/folder
 
# create tag
git tag -a v1.4 -m 'version 1.4'
git push --tags
git push origin <tag_name>
 
# remove tag
git tag -d tag123
git push origin :refs/tags/tag123
 
# checkout tag
git clone --branch bar-1.0.4 git@git.example.com:foo/ansible.git /tmp/bar-1.0.4
 
# git pull single file
git checkout origin/master -- file_name
 
# checkout commit
git checkout commit_hash

Branch

# reset branch
git reset --hard origin/master
git reset --hard origin/branch123
git reset --hard <tag/branch/commit id>
 
# rollback to revision
git checkout 96fe40ded8277725d244aac83c42256ad554cc3b .
 
# create branch
git checkout -b branch_name
 
# switch branch
git checkout branch_name
git checkout master
 
# checkout branch
git clone <url> --branch <branch> --single-branch [<folder>]
 
# diff all files betwen braches
git diff dev..stage
 
# diff singe file between branches
git diff dev..stage file1
 
# diff branches and show file name only
git diff --name-only dev..stage
 
# diff differnet fiels in different branches
git diff branch1:file branch2:file
 
# test
git reset file/to/overwrite
 
# search for string
git grep "string/regexp" $(git rev-list --all)
 
# grep
git grep foo HEAD
 
# remove last commit
git reset HEAD~1
 
# reset to latest revision
git reset --hard
 
# reset to commit-id
git reset --hard <commit-id>
git push origin HEAD --force
 
git cherry-pick commit1

branch

# diff between branches
git diff master
 
# show branches
git branch
 
# push local Git branch to remote master branch
git push origin local_branch_1:master
 
# delete local branch
git branch -d local_branch_name
 
# delete remote branch
git push origin :remote_branch_name
 
# delete directory / file from git repository without removing from disk
git rm --cached -r DIR1
 
# ignore
./.gitignore
 
# user environment settings
export GIT_COMMITTER_NAME="foo"
export GIT_COMMITTER_EMAIL="foo.bar@example.com"
export GIT_AUTHOR_NAME="foo"
export GIT_AUTHOR_EMAIL="foo.bar@example.com"
export GIT_USERNAME="foo"
export GIT_PASSWORD="foo.bar@example.com"
 
 
# global setup
git config --global user.name "first_name last_name"
git config --global user.email "user@example.com"
git config --global core.autocrlf true
 
# create a new repository
git clone git@example.com:repository_group/repository_name.git
cd repository_name
touch README.md
git add README.md
git commit -m "add README"
git push -u origin master
 
# Add existing folder or Git repository
cd existing_folder
git init
git remote add origin git@example.com:repository_group/repository_name.git
git add .
git commit
git push -u origin master
 
# search for string in commit
git grep foo $(git rev-list --all)
 
# check out single file
git archive --remote=git@git.example.com:foo/bar.git HEAD:path1/file_or_dir target_file_name | tar --extract
 
# set proxy
http://cms-sw.github.io/tutorial-proxy.html
git config --global http.proxy $http_proxy
git config --global https.proxy $https_proxy
 
# undo changes on file
git checkout -- file
 
# inclue a commit
git cherry-pick commit1
 
http.sslVerify
http.sslCAInfo
http.sslCAPath
http.sslCert
http.sslKey
http.sslCertPasswordProtected
 
# pass GIT settings over SSH
https://cweiske.de/tagebuch/carry-git-settings.htm
GIT_SSH_COMMAND="ssh -i ~/.ssh/id_rsa_example -F /dev/null" git clone example
git config core.sshCommand "ssh -i ~/.ssh/id_rsa_example -F /dev/null"

Submodule

https://chrisjean.com/git-submodules-adding-using-removing-and-updating/
git rm --cached roles/icinga-client
git submodule add git@git.example.com:foo/ansible-roles/icinga-client.git roles/icinga-client
 
# update submodule
git submodule update --recursive --remote

git hooks post-merge example

#!/bin/bash

# check for modified files
for FILE in $(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD); do
  case "${FILE}" in
    *.json)
      # Repository configuration changed: update configuration
      ~/my_repository/scripts/json_update.sh
      ;;
    cronjobs/crontab)
      # Crontab changed: update user cronjobs
      ~/my_repository/scripts/crontab_update.sh
      ;;
  esac
done
>