All of lore.kernel.org
 help / color / mirror / Atom feed
From: andholt <andholt@gmail.com>
To: git@vger.kernel.org
Subject: How to commit changes if remote repository changed directory structure?
Date: Thu, 19 Mar 2009 18:17:15 -0700 (PDT)	[thread overview]
Message-ID: <22612715.post@talk.nabble.com> (raw)


I have a lot of local changes to add, commit, and push. Right now our
directory structure is 1/2/3. Another developer decided to move everything
up one level, so used git move to move 3 to 2, and removed 3, so now the
level is 1/2. However, locally, all of my changes are in 1/2/3. 

I want to commit my changes and merge them into the new directory structure.
How would I go about doing that?

Thanks!
-- 
View this message in context: http://www.nabble.com/How-to-commit-changes-if-remote-repository-changed-directory-structure--tp22612715p22612715.html
Sent from the git mailing list archive at Nabble.com.

             reply	other threads:[~2009-03-20  1:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-20  1:17 andholt [this message]
2009-03-20  6:09 ` How to commit changes if remote repository changed directory structure? Jeff King
2009-03-20  7:08   ` Junio C Hamano
2009-03-20  7:13     ` Jeff King
2009-03-20 22:30       ` J. Bruce Fields

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=22612715.post@talk.nabble.com \
    --to=andholt@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.