From: "Michael S. Tsirkin" <mst@dev.mellanox.co.il>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: "Michael S. Tsirkin" <mst@dev.mellanox.co.il>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: RFC: git pull or git rebase?
Date: Mon, 23 Jul 2007 12:31:42 +0300 [thread overview]
Message-ID: <20070723093142.GE20614@mellanox.co.il> (raw)
In-Reply-To: <81b0412b0707230207k2fa33eb3hdc23319d1f8dbd80@mail.gmail.com>
> Quoting Alex Riesen <raa.lkml@gmail.com>:
> Subject: Re: RFC: git pull or git rebase?
>
> On 7/23/07, Michael S. Tsirkin <mst@dev.mellanox.co.il> wrote:
> >However, I wonder whether this happens to others, too.
> >Would it make sense to add a branch attribute that says
> >"do not pull this branch" or "do not rebase this branch"?
> >Maybe even make git do the right thing automatically,
> >so that git would look at this attribute and perform
> >pull or rebase as appropriate?
>
> If you have a recent enough git, it will refuse to pull into
> a branch for which there is no configured remote branch.
> Exactly for a reason like yours.
Aha. I created the tree by git clone, so my master
is configured to merge from origin automatically.
--
MST
prev parent reply other threads:[~2007-07-23 9:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-23 5:22 RFC: git pull or git rebase? Michael S. Tsirkin
2007-07-23 9:07 ` Alex Riesen
2007-07-23 9:31 ` Michael S. Tsirkin [this message]
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=20070723093142.GE20614@mellanox.co.il \
--to=mst@dev.mellanox.co.il \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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