![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 Sep 2011 04:48:10 +0000 (21:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 Sep 2011 04:48:10 +0000 (21:48 -0700) |
* ci/forbid-unwanted-current-branch-update:
branch --set-upstream: regression fix
branch --set-upstream: regression fix
| 1 | 2 | |||
|---|---|---|---|---|
| branch.c | patch | | diff1 | | diff2 | | blob | history |
| builtin/branch.c | patch | | diff1 | | diff2 | | blob | history |
| builtin/checkout.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc branch.c
Simple merge
diff --cc builtin/branch.c
Simple merge
diff --cc builtin/checkout.c
Simple merge