This is mostly Ram's triangular-push-fix series, but the fix-up commits I queued on top of it when the series was queued to 'pu' have been squashed in.
[PATCH 1/6] t/t5528-push-default: remove redundant test_config lines No changes, as posted by Ram. [PATCH 2/6] config doc: rewrite push.default section Reorganization (including moving of 'matching' to the end) is Ram's, but otherwise moderately rewritten. [PATCH 3/6] push: change `simple` to accommodate triangular workflows Sqaushed in the fix to keep the semantics of "simple" when used in the centralized workflow the same as before. [PATCH 4/6] t/t5528-push-default: generalize test_push_* As posted by Ram. [PATCH 5/6] t/t5528-push-default: test pushdefault workflows A style fix from the review, and comment tweaks to describe what each tests mean better. [PATCH 6/6] push: honor branch.*.push This is new. It probably needs tests and docs. I am trying this myself primarily because this changes the plan for Git 2.0 and jc/push-2.0-default-to-simple topic needs to be redone, but before we can do so, we need to see this topic solidify enough. Junio C Hamano (1): push: honor branch.*.push Ramkumar Ramachandra (5): t/t5528-push-default: remove redundant test_config lines config doc: rewrite push.default section push: change `simple` to accommodate triangular workflows t/t5528-push-default: generalize test_push_* t/t5528-push-default: test pushdefault workflows Documentation/config.txt | 80 ++++++++++++++++++++++++++++++------------------ builtin/push.c | 59 +++++++++++++++++++++++++++-------- remote.c | 5 +++ remote.h | 2 ++ t/t5528-push-default.sh | 65 ++++++++++++++++++++++++++++++++++++--- 5 files changed, 165 insertions(+), 46 deletions(-) -- 126.96.36.199-721-g0a353d3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html