git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Don Zickus <dzickus@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: git@vger.kernel.org, junkio@cox.net
Subject: bad git pull
Date: Thu, 15 Dec 2005 18:37:47 -0500	[thread overview]
Message-ID: <68948ca0512151537v2d8f22c8x962c55bd507af8cf@mail.gmail.com> (raw)

Hello,

I notice if I create a branch (and switch to it) in the linux kernel
off of say version 2.6.14, then later do a git pull, things get ugly. 
It seems like all the upstream changes are being merged into the
2.6.14 branch (instead of the latest kernel tag).

Is this a user error because the tool is still fragile?

Thanks,
Don

             reply	other threads:[~2005-12-15 23:37 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-12-15 23:37 Don Zickus [this message]
2005-12-15 23:42 ` bad git pull Junio C Hamano
2005-12-15 23:53   ` Junio C Hamano
2005-12-16 15:39     ` Don Zickus
2005-12-16 17:40       ` Junio C Hamano
2005-12-16 17:25     ` Carl Baldwin
2005-12-16 19:20       ` Junio C Hamano
2005-12-16 18:07     ` Morten Welinder
2005-12-16 19:21       ` Junio C Hamano
2005-12-16 22:12         ` Linus Torvalds
2005-12-17  0:37           ` Morten Welinder
2005-12-17  1:05             ` Linus Torvalds
2005-12-17  1:49               ` Junio C Hamano
2005-12-17  7:44                 ` Linus Torvalds
2005-12-17  9:28                   ` Junio C Hamano
2005-12-17 21:04                     ` Nicolas Pitre
2005-12-18  3:02                       ` Junio C Hamano
2005-12-18  4:17                         ` Nicolas Pitre
2005-12-18  6:31                           ` Linus Torvalds
2005-12-18  7:15                           ` Junio C Hamano
2005-12-18 17:16                             ` Nicolas Pitre
2005-12-17  2:19             ` Junio C Hamano

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=68948ca0512151537v2d8f22c8x962c55bd507af8cf@mail.gmail.com \
    --to=dzickus@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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).