Ciro Santilli
OurBigBook.com
$£
Sponsor
中国
独裁统治 China Dictatorship 新疆改造中心、六四事件、法轮功、郝海东、709大抓捕、2015巴拿马文件 邓家贵、低端人口、西藏骚乱
Version control
Home
Technology
Area of technology
Information technology
Computer
Software
OurBigBook.com
Tags:
Good
Words: 2k
Articles: 60
Table of contents
2k
60
Monorepo
Version control
List of version control systems
Version control
2k
58
Concurrent Versions System
List of version control systems
63
Git
List of version control systems
2k
55
Git design rationale
Git
182
Git command
Git
9
2
git clone
Git command
9
1
Download a single directory with git
git clone
9
Git internals
Git
4
Git remote communcation
Git internals
1
Serve Git over HTTP static website
Git remote communcation
Git object
Git internals
1
Git commit object
Git object
Git UI
Git
146
19
gitk
Git UI
7
tig (git UI)
Git UI
21
Git web interface
Git UI
112
16
GitHub
Git web interface
94
11
GitHub repo
GitHub
17
2
GitHub book repo
GitHub repo
17
GitHub awesome repo
GitHub repo
GitHub porn policy
GitHub
GitHub users deleted by GitHub
GitHub
GitHub Pages
GitHub
31
GitHub Sponsors
GitHub
1
Who are the developers that are making the most money through GitHub sponsors?
GitHub Sponsors
Pull request
GitHub
5
Octokat.js
GitHub
1
octokit.js
Octokat.js
GitLab
Git web interface
17
2
GitLab CI
GitLab
GitLab cookbook
GitLab
SourceForge
Git web interface
1
Git tips
Git
1k
20
Understand the commit tree
Git tips
It's not a tree, it's actually a DAG
Git tips
Why is Git a DAG?
Git tips
Linear history vs branching
Git tips
How to visualize the commit tree
Git tips
2
gitk
How to visualize the commit tree
git log --graph
How to visualize the commit tree
How to modify the commit tree
Git tips
188
4
git rebase 101
How to modify the commit tree
3
Move your branch on top of newest master
git rebase 101
Modify contents of an old commit in your branch
git rebase 101
Merge two or more commits into one
git rebase 101
Oh, but there are 2 trees: local and remote
Git tips
Merge conflicts
Git tips
500
6
git rebase moves commits one by one
Merge conflicts
The key to solve conflicts: see the two conflicting diffs
Merge conflicts
Conflict resolution tool
Merge conflicts
3
diff3
Conflict resolution tool
git mergetool
with
meld
or
kdiff3
Conflict resolution tool
But which commit from master did we conflict with exactly?
Conflict resolution tool
Git implementation
Git
2
libgit2
Git implementation
1
libgit2/rugged
libgit2
Git bibliography
Git
1
Pro Git book
Git bibliography
Perforce
List of version control systems
Ancestors
(6)
Software
Computer
Information technology
Area of technology
Technology
Home
Incoming links
(6)
Ciro Santilli's hardware
Ciro Santilli's Open Source Enlightenment
Early AtomSea & EMBII uploads
Good
Lattice Microbes
SQLite
Ciro Santilli
OurBigBook.com