Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > Junio, looks like from the 2013 discussion that you preferred just > having that mention in parenthesis instead of its own item, how about > just re-applying your fa23348 (with conflicts resolved)?
(fa23348 did this: --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1749,7 +1749,8 @@ push.default:: + This is currently the default, but Git 2.0 will change the default to `simple`. -* `upstream` - push the current branch to its upstream branch. +* `upstream` - push the current branch to its upstream branch + (`tracking` is a deprecated synonym for this). ) I agree that doing the same thing is the best option. -- Matthieu Moy http://www-verimag.imag.fr/~moy/
