summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2007-07-06 22:54:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-07-06 23:21:39 -0700
commit34a3e695497ab2abbf2fc33a46380accaa8c7c15 (patch)
treeb4f795ca6a786875cd0226ccba14c40ceab6fc8f
parentgit-send-email: allow an email alias for --from (diff)
downloadtgif-34a3e695497ab2abbf2fc33a46380accaa8c7c15.tar.xz
git-branch: default to --track
"git branch --track" will setup config variables when branching from a remote branch, so that if you say "git pull" while being on that branch, it automatically fetches the correct remote, and merges the correct branch. Often people complain that this is not the default for "git branch". Make it so. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c
index 77b85dde1f..84a8ad7b73 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -22,7 +22,7 @@ static const char builtin_branch_usage[] =
static const char *head;
static unsigned char head_sha1[20];
-static int branch_track_remotes;
+static int branch_track_remotes = 1;
static int branch_use_color;
static char branch_colors[][COLOR_MAXLEN] = {