v0.40.0

New Features

• add first 'debug' version of gix log
  It's primarily meant to better understand gix blame.
• add --tree-favor to gix merge tree|commit.
  With it one can decide which side to favor in case of
  irreconcilable tree-conflicts.

Bug Fixes

• gix merge file now uses THEIRS instead of OURS where needed

Commit Statistics

• 7 commits contributed to the release over the course of 27 calendar days.
• 28 days passed between releases.
• 3 commits were understood as conventional.
• 1 unique issue was worked on: #1703

Commit Details

view details

• #1703
  • gix merge file now uses THEIRS instead of OURS where needed (0727b56)
• Uncategorized
  • Merge pull request #1643 from cruessler/add-gix-log (29cb775)
  • Add first 'debug' version of gix log (c7e04e9)
  • Merge pull request #1705 from GitoxideLabs/merge (520c832)
  • Adapt to changes in gix-diff (960773e)
  • Add --tree-favor to gix merge tree|commit. (471e046)
  • Merge pull request #1704 from GitoxideLabs/fix-1703 (e8ce25f)