From: Paolo Bonzini <paolo.bonzini@gmail.com>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Julian Phillips <julian@quantumfyre.co.uk>,
Andy Parkins <andyparkins@gmail.com>,
git@vger.kernel.org, Junio C Hamano <junkio@cox.net>
Subject: Re: defaults for where to merge from
Date: Thu, 01 Mar 2007 09:45:11 +0100 [thread overview]
Message-ID: <45E69297.8070001@lu.unisi.ch> (raw)
In-Reply-To: <81b0412b0703010033w2e1079a3l6ac6e38c59bdefd5@mail.gmail.com>
>> While I am probably going to modify the patch to satisfy Junio, have you
>> noticed that "git branch -d" will delete the section, hence .git/config
>> will not be growing uncontrollably?
>
> Maybe you also have noticed that it will remove also the reference?
Sure I have.
> How do I remove the garbage you added for TRACKING?!
I see two possibilities:
1) I can add a "git-config --remove-section" option. So you can do
"git-pull" to merge onto your branches, and then remove the tracking
section.
2) I can add a "git-branch --stop-tracking" option, which just removes
the section.
3) Same as 2), plus I add a "git-branch --no-track" option, which does
not add the section in the first place. But I do believe that there is
no reason why this cannot be the default.
Paolo
next prev parent reply other threads:[~2007-03-01 8:45 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-28 14:53 defaults for where to merge from Paolo Bonzini
2007-02-28 15:13 ` Johannes Schindelin
2007-02-28 15:22 ` Andy Parkins
2007-02-28 15:30 ` Paolo Bonzini
2007-02-28 15:43 ` Andy Parkins
2007-02-28 15:30 ` Julian Phillips
2007-02-28 15:46 ` Johannes Schindelin
2007-02-28 17:11 ` Paolo Bonzini
2007-02-28 18:06 ` Johannes Schindelin
2007-03-01 7:52 ` [PATCH] defaults for where to merge from (take 2) Paolo Bonzini
2007-02-28 18:45 ` defaults for where to merge from Alex Riesen
2007-02-28 19:56 ` Paolo Bonzini
2007-03-01 0:07 ` Alex Riesen
2007-03-01 1:25 ` Johannes Schindelin
2007-03-01 7:55 ` Alex Riesen
2007-03-01 8:02 ` Paolo Bonzini
2007-03-01 8:10 ` Alex Riesen
2007-03-01 8:18 ` Junio C Hamano
2007-03-02 15:53 ` J. Bruce Fields
2007-03-01 8:29 ` Paolo Bonzini
2007-03-01 8:33 ` Alex Riesen
2007-03-01 8:45 ` Paolo Bonzini [this message]
2007-03-01 8:59 ` Alex Riesen
2007-03-01 9:37 ` [PATCH] defaults for where to merge from (take 3) Paolo Bonzini
2007-03-01 10:12 ` Alex Riesen
2007-03-01 10:17 ` Paolo Bonzini
2007-03-01 10:27 ` Junio C Hamano
2007-03-01 10:42 ` Alex Riesen
2007-03-02 4:49 ` Junio C Hamano
2007-03-02 9:05 ` Alex Riesen
2007-03-02 9:57 ` Junio C Hamano
2007-03-01 10:47 ` Alex Riesen
2007-03-01 16:33 ` [PATCH] defaults for where to merge from (take 3, inline) Paolo Bonzini
2007-03-01 22:01 ` Johannes Schindelin
2007-03-02 8:10 ` Paolo Bonzini
2007-03-02 8:50 ` [PATCH, 4th version] git-branch: register where to merge from, when branching off a remote branch Paolo Bonzini
2007-03-02 9:52 ` Junio C Hamano
2007-03-02 9:55 ` Junio C Hamano
2007-03-02 10:32 ` Jeff King
2007-03-02 11:15 ` Paolo Bonzini
2007-03-02 11:21 ` Jeff King
2007-03-02 11:14 ` Paolo Bonzini
2007-03-02 15:54 ` Johannes Schindelin
2007-03-02 16:33 ` Paolo Bonzini
2007-03-02 19:06 ` Johannes Schindelin
2007-03-02 11:19 ` [PATCH] defaults for where to merge from (take 3, inline) Johannes Schindelin
2007-03-02 14:10 ` Jakub Narebski
2007-02-28 17:31 ` defaults for where to merge from Peter Baumann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45E69297.8070001@lu.unisi.ch \
--to=paolo.bonzini@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=andyparkins@gmail.com \
--cc=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=julian@quantumfyre.co.uk \
--cc=junkio@cox.net \
--cc=raa.lkml@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).