Ciro Santilli
OurBigBook.com
$£
Sponsor
中国
独裁统治 China Dictatorship 新疆改造中心、六四事件、法轮功、郝海东、709大抓捕、2015巴拿马文件 邓家贵、低端人口、西藏骚乱
Git tips
...
Information technology
Computer
Software
Version control
List of version control systems
Git
OurBigBook.com
words: 2k
articles: 20
This is a quick presentation that goes over some of the most common difficulties people find with
Git
.
Table of contents
2k
20
Understand the commit tree
Git tips
27
It's not a tree, it's actually a DAG
(Directed Acyclic Graph)
Git tips
162
Why is Git a DAG?
Git tips
44
Linear history vs branching
Git tips
140
How to visualize the commit tree
Git tips
229
2
gitk
How to visualize the commit tree
58
git log --graph
How to visualize the commit tree
99
How to modify the commit tree
Git tips
214
4
git rebase 101
How to modify the commit tree
188
3
Move your branch on top of newest master
git rebase 101
42
Modify contents of an old commit in your branch
git rebase 101
85
Merge two or more commits into one
git rebase 101
61
Oh, but there are 2 trees: local and remote
Git tips
80
Merge conflicts
Git tips
702
6
git rebase moves commits one by one
Merge conflicts
132
The key to solve conflicts: see the two conflicting diffs
Merge conflicts
70
Conflict resolution tool
Merge conflicts
500
3
diff3
Conflict resolution tool
314
git mergetool
with
meld
or
kdiff3
Conflict resolution tool
150
But which commit from master did we conflict with exactly?
Conflict resolution tool
36
Ancestors
(9)
Git
List of version control systems
Version control
Software
Computer
Information technology
Area of technology
Technology
Home
Ciro Santilli
OurBigBook.com