# Git - tips & tricks
Protips de Christophe Porteneuve : Devoxx2016
# cloning
# cloning a repository in a specific folder
$ git clone <url> <dir_name>
1
2
2
# branch
# list local branch
$ git branch -l
1
2
2
# list all branches (remote and local, tracked and untracked) : git remote show [remote]
$ git remote show origin
* remote origin
Fetch URL: https://github.com/OneBusAway/onebusaway-android
Push URL: https://github.com/OneBusAway/onebusaway-android
HEAD branch: master
Remote branches:
amazon-rc2 new (next fetch will store in remotes/origin)
amazon-rc3 new (next fetch will store in remotes/origin)
arrivalStyleBDefault new (next fetch will store in remotes/origin)
develop tracked
master tracked
refs/remotes/origin/branding stale (use 'git remote prune' to remove)
Local branches configured for 'git pull':
develop merges with remote develop
master merges with remote master
Local refs configured for 'git push':
develop pushes to develop (local out of date)
master pushes to master (up to date)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
# delete local branch
$ git branch -d <branch_name>
1
2
2
# delete a local branch with diff from other branch
$ git branch -D <branch_name>
1
2
2
# list local branch filtered with local branches merged in the currently checkouted branch
$ git branch --merged
iss53
* master
# we are on the master branch, and the iss53 branch have been merged in.
1
2
3
4
5
2
3
4
5
How to list branches that contain a given commit? - stackoverflow.com
# list local branches to that local commit
$ git branch --contains <commit>
# list local branches that have a direct relationship to a remote branch
$ git branch -r --contains <commit>
1
2
3
4
5
2
3
4
5
# working directory
# change working directory with HEAD of branch_name
$ git checkout <branch_name>
1
2
2
# change working directory with last branch
$ git checkout -
1
2
2
# create and pull a remote branch from a remote
$ git checkout -b <new_branch> origin/<new_branch>
1
2
2
# create a local branch, do stuff, then push that new branch to the remote repo
$ git checkout -b mynewfeature
... edit files, add and commit ...
$ git push -u origin mynewfeature
1
2
3
4
2
3
4
# commit management
# delete last commit (will not delete modifications, just the commit)
$ git reset HEAD^
1
2
2
# delete the 3 last commits (will not delete modifications, just the commits)
$ git reset --soft HEAD~3
1
2
2
# delete the 3 last commits (including last modifications)
$ git reset --hard HEAD~3
1
2
2
# rename last commit msg
$ git commit --amend -m "New commit message"
1
2
2
# rollback local repo after a git pull
# use git log to find the hash of the desired commit then
$ git reset --hard 1234abcd where 1234abcd is the hash of the desired commit.
1
2
3
2
3
# commit message management
# diff
# checking difference between the current branch and the non-staged changes
$ git diff
1
2
2
# checking difference between the current branch and the staged changes
$ git diff --staged
# or
$ git diff --cached
1
2
3
4
2
3
4
# checking difference between 2 branches and put that log into a file
$ git diff main-branch..alt-branch > file.name.diff
1
2
2
# checking difference in a single file between 2 tags
$ git diff 0.11.0..0.12.0 src/config.js
1
2
2
# same as above but without the context line (output just the changes)
$ git diff --unified=0 0.11.0..0.12.0 src/config.js
1
2
2
# modified files list between 2 tags
$ git diff --stat <tag1>...<tag2>
1
2
2
# merge management
# cancel a merge (git version >= 1.7.4)
$ git merge --abort
1
2
2
# merge conflict in favor of "their" changes (origin changes)
$ git merge --strategy-option theirs
1
2
2
# Find the most recent common ancestor of two branches (see https://stackoverflow.com/questions/1549146/git-find-the-most-recent-common-ancestor-of-two-branches)
$ git merge-base branch2 branch3
1
2
2
# cherry-pick
# cherry-pick a specific commit from one branch to another
# (https://ariejan.net/2010/06/10/cherry-picking-specific-commits-from-another-branch/)
# here master is the targeted branch (ie : where the commit will go)
$ git checkout master
$ git cherry-pick 1234abcd
1
2
3
4
5
2
3
4
5
# cherry-pick from another repo
source : git-cherry-pick-from-another-repository : 20160913
# Cloning our fork
$ git clone git@github.com:ifad/rest-client.git
# Adding (as "endel") the repo from we want to cherry-pick
$ git remote add endel git://github.com/endel/rest-client.git
# Fetch their branches
$ git fetch endel
# List their commits
$ git log endel/master
# Cherry-pick the commit we need
$ git cherry-pick 97fedac
1
2
3
4
5
6
7
8
9
10
11
12
13
14
2
3
4
5
6
7
8
9
10
11
12
13
14
# patch
creer-et-appliquer-un-patch-avec-git : renaudmathieu.fr : 201300820
# listing the 10 alst commit, stdout only the complete sha1 then the commit title
$ git log --pretty=oneline -10
# -1 indicates there is only one commit contained in the patch ; this will create a .patch file containing the commit
$ git format-patch -1 <sha1> --stdout > <name>.patch
# check the diff
$ git apply --stat <name>.patch
# check if the patch is appliable
$ git apply --check <name>.patch
# signoff is to keep the original author in the commit metadata. -k is to keep flags in the commit message
$ git am --signoff -k < <name>.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
2
3
4
5
6
7
8
9
10
11
12
13
14
cherry-picking-range-of-git-commits : feeding.cloud.geek.nz : 20100720
# creating multiples patches from a range of commits
$ git format-patch 7f545188^..a7785c10
0001-Add-third-file.patch
0002-Add-lines-to-3rd-file.patch
$ git am *.patch
1
2
3
4
5
2
3
4
5
# files tracking
# removing a directory from git tracking without deleting it locally
# first, add the folder to the .gitignore file
# then
$ git rm -r --cached path_to_your_folder/
1
2
3
4
2
3
4
# ignore changes on tracked files
$ git update-index --assume-unchanged README.md
# list ignored files
$ git ls-files -v | grep '^h'
# rollback
$ git update-index --no-assume-unchanged README.d
1
2
3
4
5
6
7
8
2
3
4
5
6
7
8
# log
# print a log filtered on commit message with regex
$ git log --grep 'regex'
1
2
2
# print a log filtered on commit content (+ lines & -lines) with regex
$ git log -G 'regex'
1
2
2
# print a log filtered on author name
$ git log --author="automatix"
1
2
2
# print a log filtered since commit date
$ git log --since="2013-01-30"
# print a log filtered until commit date
$ git log --until="2013-01-30"
1
2
3
4
2
3
4
# print a log with a list of modified files
$ git log --stat
1
2
2
# print a log of all commits from all branches (just active branch by default)
$ git log --all
1
2
2
# print a condensed log where each commit is one line
$ git log --oneline
1
2
2
# print a graphic log in console
$ git log --graph
1
2
2
# print a graphic log in console from all branches where a commit is only one line
$ git log --graph --oneline --all
1
2
2
# print the commit list changelog between 2 tags
$ git log 0.11.0..0.12.0 --oneline
1
2
2
# print the commit list changelog (without merge commits) between 2 tags
$ git log 0.11.0..0.12.0 --oneline --no-merges
1
2
2
# print the commit list changelog with changed files between 2 tags
$ git log 0.11.0..0.12.0 --oneline --stat
1
2
2
# print a condensed log for a given file name, following files names rewrites
$ git log --oneline --follow "project/dir/subdir/file.ext"
1
2
2
# print a condensed log for a given file name, including merge commits
$ git log --oneline --full-history "project/dir/subdir/file.ext"
1
2
2
# print the committer name and email (can be different with the author name and email)
$ git log --pretty=format"%cn <%ce> committed %h on %cd"
# where %cn = committer name, %ce = commiter email, %h = abbreviated commit hash, %cd = committer date
1
2
3
2
3
# print the author name and email
$ git log --pretty=format"%an <%ae> committed %h on %cd"
# where %an = author name, %ae = author email, %h = abbreviated commit hash, %cd = committer date
1
2
3
2
3
# blame
# who have modified each line with timestamp
$ git blame sha1_file.c
...
0fcfd160 (Linus Torvalds 2005-04-18 13:04:43 -0700 8) */
0fcfd160 (Linus Torvalds 2005-04-18 13:04:43 -0700 9) #include "cache.h"
1f688557 (Junio C Hamano 2005-06-27 03:35:33 -0700 10) #include "delta.h"
a733cb60 (Linus Torvalds 2005-06-28 14:21:02 -0700 11) #include "pack.h"
8e440259 (Peter Eriksen 2006-04-02 14:44:09 +0200 12) #include "blob.h"
8e440259 (Peter Eriksen 2006-04-02 14:44:09 +0200 13) #include "commit.h"
8e440259 (Peter Eriksen 2006-04-02 14:44:09 +0200 14) #include "tag.h"
8e440259 (Peter Eriksen 2006-04-02 14:44:09 +0200 15) #include "tree.h"
f35a6d3b (Linus Torvalds 2007-04-09 21:20:29 -0700 16) #include "refs.h"
70f5d5d3 (Nicolas Pitre 2008-02-28 00:25:19 -0500 17) #include "pack-revindex.h"628522ec (Junio C Hamano 2007-12-29 02:05:47 -0800 18) #include "sha1-lookup.h"
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
2
3
4
5
6
7
8
9
10
11
12
13
14
# can be filtered to specific line range
$ git blame -L 160,+10 sha1_file.c
ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700 160)}
ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700 161)
0fcfd160 (Linus Torvalds 2005-04-18 13:04:43 -0700 162)/*
0fcfd160 (Linus Torvalds 2005-04-18 13:04:43 -0700 163) * NOTE! This returns a statically allocate
790296fd (Jim Meyering 2008-01-03 15:18:07 +0100 164) * careful about using it. Do an "xstrdup()
0fcfd160 (Linus Torvalds 2005-04-18 13:04:43 -0700 165) * filename.
ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700 166) *
ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700 167) * Also note that this returns the location
ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700 168) * SHA1 file can happen from any alternate
d19938ab (Junio C Hamano 2005-05-09 17:57:56 -0700 169) * DB_ENVIRONMENT environment variable if i
1
2
3
4
5
6
7
8
9
10
11
12
2
3
4
5
6
7
8
9
10
11
12
# checking changes between 2 tags
We want to know :
- the commit list
- the changed files list by commit
- the full changed files list
- the full changed content
# print the commit list that <tag2> have and <tag1> does not have (just sha1 and log msg)
$ git log --oneline <tag1>..<tag2>
1
2
2
# print the commit list that <tag2> have and <tag1> does not have (just sha1 and log msg) with the changed files, commit by commit
$ git log --oneline --stat <tag1>..<tag2>
1
2
2
# print the changed files list in <tag2> files that <tag1> files does not have
$ git diff --stat <tag1>...<tag2>
1
2
2
# print the content changed in <tag2> files that <tag1> files does not have
$ git diff <tag1>...<tag2>
1
2
2
# reflog
# print the history of the tip of the branch (you can see how the HEAD have evolved)
$ git reflog
# or (show is the default one)
$ git reflog show
1
2
3
4
5
2
3
4
5
# git reflog show accepts the same commands as git log, here you can print the modified files
$ git reflog show --stat
1
2
2