This website works better with JavaScript.
Explore
Register
Sign In
kernel
/
git
mirror of
https://git.kernel.org/pub/scm/git/git.git
Watch
1
Star
0
Fork
You've already forked git
0
Code
Releases
Activity
1749
Commits
6
Branches
36
Tags
131 MiB
C
49.9%
Shell
38.3%
Perl
5.5%
Tcl
3.5%
Python
0.9%
Other
1.6%
Tree:
f88ed172e7
git
/
Documentation
/
technical
History
Daniel Barkalow
3d89cb4f3f
[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
...
Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net>
20 years ago
..
trivial-merge.txt
[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
20 years ago