Always update to the specified branch even if the branch is already rebased (no commits needed to be rebased, and the branch does not need a fast forward). With the old behavior of erroring and staying on the current branch, I sometimes found myself ignoring the error message, treating it as information and assuming the branch update, and later on committing on top of origin/main instead of the main branch. feedback and ok stsp

Tests by kn, thomas_adam and myself made on various repositories indicate that 3 is a good choice. Tyring 10 deltas is much slower and does not result in significantly smaller pack files.

Although configure.ac will for the presence of bison, the READMEs didn't say that was a required program. Patch from Carlos Torres

Update CHANGELOG and configure.ac for the 0.62 release.

sys/{tree,queue}.h are looked up via configure, and therefore are included via that mechanism.

OK stsp

Commands which perform merges will now install bad symlinks as symlinks in the work tree, instead of creating them as regular files. This means bad symlinks committed with 'got commit -S' (or Git) will be preserved. The decision to introduce a bad symlink is done at commit-time and merges should not forcefully reverse this decision. The cherrypick and backout commands require a manual commit step, and a merge result with bad symlinks will require use of 'got commit -S'. Additional testing by thomas adam

This reverts commit c565dfd37a157bab9556aceac96ff27d64525fc9.

Same problem as fixed in 90de04bc7f1b85b9c491bcd124f6178fad005de1. ok stsp

Problem reported and fix tested by Omar Polo.

Update regress/fetch to compile with bloom.