git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Peter Harris" <git@peter.is-a-geek.org>
To: "Paul Vincent Craven" <paul@cravenfamily.com>
Cc: git@vger.kernel.org
Subject: Re: Question with git push
Date: Tue, 23 Dec 2008 12:35:50 -0500	[thread overview]
Message-ID: <eaa105840812230935o63ac7960h728c905da12b8cc0@mail.gmail.com> (raw)
In-Reply-To: <5591393c0812230859n3b50b1f9k36153f40dd75ff57@mail.gmail.com>

On Tue, Dec 23, 2008 at 11:59 AM, Paul Vincent Craven wrote:
> If I do a 'git push' to another repository, my changes are reverted
> the next time that repository is updated, unless I do a hard reset on
> the remote repository first. Of course, then I would lose my changes
> in the remote repository. What is the correct way of handling this?

Pull from the other side, or push to a branch that you never check
out. Better yet, push to a bare (no work tree) repo you can pull from
both sides.

http://git.or.cz/gitwiki/GitFaq#head-b96f48bc9c925074be9f95c0fce69bcece5f6e73

Peter Harris

  reply	other threads:[~2008-12-23 17:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-23 16:59 Question with git push Paul Vincent Craven
2008-12-23 17:35 ` Peter Harris [this message]
2008-12-23 17:37 ` demerphq

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=eaa105840812230935o63ac7960h728c905da12b8cc0@mail.gmail.com \
    --to=git@peter.is-a-geek.org \
    --cc=git@vger.kernel.org \
    --cc=paul@cravenfamily.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).