Code

use gitoxide for merging trees#5411

Code

Merged

krlvi merged 5 commits intomastergitbutlerapp/gitbutler:masterfrom performancegitbutlerapp/gitbutler:performanceCopy head branch name to clipboardNov 2, 2024

+511-440

Commits

Commits on Nov 2, 2024

• The UUID crate always needs V4, so have that feature in the workspace.

  Show description for 6997980
  Byron

  committed
  6997980

• remove ineffective diff options when diffing trees.

  Show description for e807141
  Byron

  committed
  e807141

• Use the latest version of gitoxide with support for merging trees.

  Byron

  committed
  7327a57

• Use gitoxide or is_integrated().

  Show description for 4c8d270
  Byron

  committed
  4c8d270

• avoid duplicate MD5 hash generation

  Byron

  committed
  e4079e5