git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Bruce Korb" <bruce.korb@gmail.com>
To: git@vger.kernel.org
Subject: I've tried to read the manuals, but "git pull" just won't work
Date: Sat, 2 Aug 2008 21:58:19 -0700	[thread overview]
Message-ID: <668c430c0808022158s56e22c56t3bbd61eef59d7b32@mail.gmail.com> (raw)

Sorry, I don't know where else to turn.
I've modified my local copy of ChangeLog and my "git pull" says, "Oh, oh!
You'd overwrite your changes" and refuses to pull.  I tried
"git reset HEAD  ChangeLog", but it says all sorts of crazy things
that make no sense and I'm still stuck.  I know I can fix this:
pull my edits into a patch, throw away my repository, clone a fresh
copy.  There has to be a better way.  The better  way is just too
obtuse to figure out.....Help, please?  Thank you.

             reply	other threads:[~2008-08-03  4:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-03  4:58 Bruce Korb [this message]
2008-08-03  5:21 ` I've tried to read the manuals, but "git pull" just won't work Matt Pearson

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=668c430c0808022158s56e22c56t3bbd61eef59d7b32@mail.gmail.com \
    --to=bruce.korb@gmail.com \
    --cc=git@vger.kernel.org \
    /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).