git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: g2 <gerald.gutierrez@gmail.com>
To: git@vger.kernel.org
Subject: How to jump between two repositories ...
Date: Tue, 4 Dec 2007 21:59:57 -0800	[thread overview]
Message-ID: <C6AF7922-B2F7-42EB-B5DD-25353BC0AF2A@gmail.com> (raw)

Hello all,

I am currently working on some code at the office that I also want to  
work with at home. Seems like a good candidate for git. So I created a  
repository at work and did a "git clone" at home. I've run into some  
strange behaviour that I don't understand and would appreciate if  
someone can clarify for me.

Imagine this scenario. At work:
git init
edit test.c
git add test.c
git commit

Then at home:
git clone <work git url>
edit test.c
git commit -a
git push

At this point, I wanted to push my changes back to my work repository  
so I can continue work the next day. So at home, I did a git push. I  
expect that my work repository has the newest material, but I find  
that when I do "git status" at work the next day, it tells me that my  
test.c is "modified" and has already staged it for commit. I need to  
do a "git reset" followed by "git checkout" to update my work folder  
to the latest stuff.

Totally different from my expectation of the repository knowing that  
it is out of date and then kindly suggesting that I should do a "git  
update" of some sort. What piece of understanding am I missing to  
properly "get" what is going on here, and how am I supposed to  
properly work with this setup?

Thanks for any help.
Gerald.

             reply	other threads:[~2007-12-05  6:00 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-05  5:59 g2 [this message]
2007-12-05  6:11 ` How to jump between two repositories Shawn O. Pearce
2007-12-05  6:14 ` J. Bruce Fields
2007-12-05  8:45   ` Andreas Ericsson
2007-12-05 15:28     ` g2
2007-12-05 16:19       ` Andreas Ericsson
2007-12-05  6:20 ` Väinö Järvelä
2007-12-05  6:44   ` g2
2007-12-05  6:57     ` Steven Grimm
2007-12-05  7:32     ` Väinö Järvelä

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=C6AF7922-B2F7-42EB-B5DD-25353BC0AF2A@gmail.com \
    --to=gerald.gutierrez@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).