Code

tree-merge follow-up#1651

Code

Merged

Byron merged 10 commits intomainGitoxideLabs/gitoxide:mainfrom mergeGitoxideLabs/gitoxide:mergeCopy head branch name to clipboardNov 5, 2024

+347-107

Commits

Commits on Nov 5, 2024

• remove a TODO that turned out to be unnecessary.

  Show description for 5b428a9
  Byron

  committed
  5b428a9

  Copy full SHA for 5b428a9

• feat: add Conflict::is_unresolved() as utility to see if multiple of them are considered unresolved.

  Byron

  committed
  9e106c4

  Copy full SHA for 9e106c4

• feat: add Object::peel_to_commit() to assure an object turns into a commit.

  Byron

  committed
  2fce14f

  Copy full SHA for 2fce14f

• feat: add Repository::index_or_load_from_head_or_empty().

  Show description for 1f9556a
  Byron

  committed
  1f9556a

  Copy full SHA for 1f9556a

• feat: add objects::tree::Editor::detach() to get the underlying editor back.

  Show description for 27b663e
  Byron

  committed
  27b663e

  Copy full SHA for 27b663e

• feat!: Repository::merge_trees() now has a fully-wrapped outcome.

  Show description for 1d2262f
  Byron

  committed
  1d2262f

  Copy full SHA for 1d2262f

• fix!: rename blob-merge feature to tree-merge.

  Show description for 2547935
  Byron

  committed
  2547935

  Copy full SHA for 2547935

• adapt to changes in gix

  Byron

  committed
  589ee8e

  Copy full SHA for 589ee8e

• feat!: Repository::merge_trees() now takes portable version of Options.

  Byron

  committed
  a43e563

  Copy full SHA for a43e563

• adapt to changes in gix

  Byron

  committed
  8d590f3

  Copy full SHA for 8d590f3