| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| automerge.c | ||
| commits.c | ||
| modeconflict.c | ||
| recursive.c | ||
| renames.c | ||
| treediff.c | ||
| trivial.c | ||
| whitespace.c |
Our virtual commit must be the last argument to merge-base: since our
algorithm pushes _both_ parents of the virtual commit, it needs to be
the last argument, since merge-base:
> Given three commits A, B and C, git merge-base A B C will compute the
> merge base between A and a hypothetical commit M
We want to calculate the merge base between the actual commit ("two")
and the virtual commit ("one") - since one actually pushes its parents
to the merge-base calculation, we need to calculate the merge base of
"two" and the parents of one.
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| automerge.c | Loading commit data... | |
| commits.c | Loading commit data... | |
| modeconflict.c | Loading commit data... | |
| recursive.c | Loading commit data... | |
| renames.c | Loading commit data... | |
| treediff.c | Loading commit data... | |
| trivial.c | Loading commit data... | |
| whitespace.c | Loading commit data... |