Carlos Martín Nieto <cmn@xxxxxxxx> writes:
> The new options allows us to type
>
> git branch --set-upstream-to origin/master
This is cool :-).
> Documentation/git-branch.txt | 9 ++++++++-
> builtin/branch.c | 15 +++++++++++++--
I think this deserves a few new tests (probably in t/t3200-branch.sh).
> +-u <upstream>::
> +--set-upstream-to=<upstream>::
> + Set up <branchname>'s tracking information so <upstream> is
> + considered <branchname>'s upstream branch. If no branch is
> + specified it defaults to the current branch.
Perhaps "if <branchname> is not specified, then it defaults to the
current branch.". The current wording does not make it very clear if "no
branch is specified" refers to <branchname> or <upstream> (although the
second option would be plain silly).
> + } else if (new_upstream) {
> + struct branch *branch = branch_get(argv[0]);
> +
> + if (!ref_exists(branch->refname))
> + die(_("branch '%s' does not exist"), branch->name);
Indentation (2 spaces -> tab).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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