From: Howard Miller <howard@e-learndesign.co.uk>
To: git@vger.kernel.org
Subject: Merge (or maybe rebase) question
Date: Mon, 12 Oct 2009 12:55:37 +0100 [thread overview]
Message-ID: <26ae428a0910120455k7ab5aa5ag8d701050e7acec5f@mail.gmail.com> (raw)
Another how best to do this.
- I have my project all nicely in git with all the different releases
and versions in there going back years. Happy :-)
- I have a customer who has heaviliy modified an oldish version of the
software.
- I have identified the version that they modified and created a
branch in my git repo based on that version (i.e. what they would have
started with before modifying it)
- Their changes where applied to a simple download - no version
control, no nothing.
I now need to update them to the latest version of the software - can
git help me here or is it all a disaster?
As usual, any advice much appreciated.
PS. To make matters worse - their original is full of expanced CVS
$Id:$ tags so it will look to git like every single file has changed.
Damn you cvs!!!
next reply other threads:[~2009-10-12 12:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-12 11:55 Howard Miller [this message]
2009-10-12 18:13 ` Merge (or maybe rebase) question Alex Riesen
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=26ae428a0910120455k7ab5aa5ag8d701050e7acec5f@mail.gmail.com \
--to=howard@e-learndesign.co.uk \
--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).