Dulwich

dulwich:merge-base

  1. Git
  2. lp:dulwich
  3. merge-base
Last commit made on 2020-05-12
Get this branch:
git clone -b merge-base https://git.launchpad.net/dulwich

Branch merges

Branch information

Name:
merge-base
Repository:
lp:dulwich

Recent commits

d22c692... by Jelmer Vernooij

Update license merge_base module to the common Dulwich license.

Permission from Kevin here: https://github.com/dulwich/dulwich/issues/754#issuecomment-626669534

dcced7e... by Jelmer Vernooij

Move tests for merge base out into unittest classes.

9329be1... by kevinhendricks <email address hidden>

Add merge_base module.

1d7b2db... by Jelmer Vernooij

Add some tests for merge base and merge.

ad368fb... by Jelmer Vernooij

Add test for find_merge_base.

3a62248... by Jelmer Vernooij

Pass along file_merger argument.

2741be5... by Jelmer Vernooij

Allow passing in a repository location to dulwich.porcelain.merge().

3be7731... by Jelmer Vernooij

Import some fixes from Kevin's branch.

751be68... by Jelmer Vernooij

Don't pass in other twice. Thanks, Kevin.

57e4899... by Jelmer Vernooij

Add some more of the skeleton for merge.