[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Switching from old git tree
From: |
Sven Axelsson |
Subject: |
Re: Switching from old git tree |
Date: |
Fri, 14 Nov 2014 13:35:17 +0100 |
On 14 November 2014 13:20, David Kastrup <address@hidden> wrote:
> address@hidden (Peder O. Klingenberg) writes:
>
>> I have been using the old git-mirror for a while. In there, I have a
>> branch with some local modifications.
>>
>> I understand that I need to check out a fresh tree now after the
>> conversion? What is the smoothest way of integrating my local branch in
>> this new tree? I'm a very basic git user, and the only way I can think
>> of is to extract the patches from my old branch and applying them by
>> hand in the new tree.
>
> Using git format-patch and git am, rather than git diff and git apply.
>
>> Is there something else I should be doing instead?
>
> I don't think there is much of an option to do something else.
I suppose you could add your old repo as a local remote to the new one, and
cherry-pick your commits, i.e.:
git remote add old /local/path/to/old
# Fetch the data to your new repo
git fetch old
# Find the commits to pick somehow
git log old/master
# Copy to new repo
git cherry-pick <sha-of-commit>
--
Sven Axelsson
++++++++++[>++++++++++>+++++++++++>++++++++++>++++++
>++++<<<<<-]>++++.+.++++.>+++++.>+.<<-.>>+.>++++.<<.
+++.>-.<<++.>>----.<++.>>>++++++.<<<<.>>++++.<----.
- Switching from old git tree, Peder O. Klingenberg, 2014/11/14
- Re: Switching from old git tree, David Kastrup, 2014/11/14
- Re: Switching from old git tree,
Sven Axelsson <=
- Re: Switching from old git tree, Sven Axelsson, 2014/11/14
- Re: Switching from old git tree, Peder O. Klingenberg, 2014/11/14
- Re: Switching from old git tree, David Kastrup, 2014/11/14
- Re: Switching from old git tree, Sven Axelsson, 2014/11/14
- Re: Switching from old git tree, Andreas Schwab, 2014/11/14
- Re: Switching from old git tree, David Caldwell, 2014/11/14
- Re: Switching from old git tree, David Kastrup, 2014/11/14
- Re: Switching from old git tree, Kenneth Raeburn, 2014/11/15
- Re: Switching from old git tree, Eli Zaretskii, 2014/11/15
- Re: Switching from old git tree, David Kastrup, 2014/11/15