summaryrefslogtreecommitdiff
path: root/src/push.c
diff options
context:
space:
mode:
authorTyrie Vella <tyrielv@gmail.com>2018-01-22 14:44:31 -0800
committerEdward Thomson <ethomson@edwardthomson.com>2018-02-04 10:29:41 +0000
commit1403c61265e6e459676c605ae934e8a86b58266c (patch)
treeea8b699e888017be0c925352750caaadf95e1a44 /src/push.c
parentb8823c2b1c2962edd7b2bf550266d4f136100182 (diff)
downloadlibgit2-ethomson/recursive.tar.gz
merge: virtual commit should be last argument to merge-baseethomson/recursive
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.
Diffstat (limited to 'src/push.c')
0 files changed, 0 insertions, 0 deletions