From: Felipe Contreras <felipe.contreras@xxxxxxxxx> Instead of setting the configuration variables branch.<name>.merge and branch.<name>.remote by hand, use the shortcut 'git branch -u', which is exactly equivalent. It's much more readable now. [rr: commit message] Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> --- t/t1508-at-combinations.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh index d5d6244..46e3f16 100755 --- a/t/t1508-at-combinations.sh +++ b/t/t1508-at-combinations.sh @@ -31,10 +31,8 @@ test_expect_success 'setup' ' git checkout -b new-branch && test_commit new-one && test_commit new-two && - git config branch.old-branch.remote . && - git config branch.old-branch.merge refs/heads/master && - git config branch.new-branch.remote . && - git config branch.new-branch.merge refs/heads/upstream-branch + git branch -u master old-branch && + git branch -u upstream-branch new-branch ' check HEAD new-two -- 1.8.3.rc0.40.g09a0447 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html