Junio C Hamano <gitster@xxxxxxxxx> writes: > Josh Steadmon <steadmon@xxxxxxxxxx> writes: > >> Changes since V5: >> * Greatly simplified BRANCH_CONFIG_VERBOSE output to not require nearly >> so many conditionals. >> * Note that rebasing is not compatible with inheriting multiple upstream >> branches. >> * Moved the change to case-sensitivity for branch.autosetupmerge to its >> own commit. >> * Improve advice on failed tracking setup when multiple branches are >> involved. >> * Make better use of string_list API. >> * Make better use of config API. >> * More straight-forward use of the `struct tracking` API. >> * Numerous style fixes. > > I've queued this, and rebased Glen's "branch --recurse-submodules" > on top, and parked both of them near the tip of 'seen'. I do not > have much confidence in the conflict resolution needed during the > rebasing or the other branch or merges into 'seen', and I would > appreciate it if you two can take a look to sanity check the result. > > Thanks. I've just sent out a new version [1] which is rebased on top of Josh's v6. Please use that version instead :) I did not rebase this on top of 'seen' though; I'll take a look and see if there's anything of concern. [1] https://lore.kernel.org/git/20211216003213.99135-1-chooglen@xxxxxxxxxx/,
