Giter VIP home page Giter VIP logo

Comments (5)

chrisbra avatar chrisbra commented on August 17, 2024

from my side this is okay

from vim-history.

k-takata avatar k-takata commented on August 17, 2024

I have written the history and done git push -f.
The old master and vim-5-8 branches were renamed to old-master and old-vim-5-8.

from vim-history.

k-takata avatar k-takata commented on August 17, 2024

To update a local repository:

$ git fetch --tags
$ git reset --hard @{u}

Or it might be easier to clone newly.

from vim-history.

k-takata avatar k-takata commented on August 17, 2024

If there is someone already uses https://github.com/vim/vim-history#merge-the-whole-history, and want to keep the same local repository, try this:

git fetch vim-history --tags
git replace --graft v7.0001 vim-6-3-004 -f

from vim-history.

k-takata avatar k-takata commented on August 17, 2024

Just for my note, this is how I fixed the history:

git checkout -b vim-5-0 v5.0; (unpack vim-5.0.tar.gz, vime-5.0.tar.gz and commit)
git checkout -b vim-5-1 v5.1; (unpack vime-5.1.tar.gz and commit)
git checkout -b vim-5-2 v5.2; (commit extra files for 5.2 [1])
git checkout -b vim-5-3 v5.3; (unpack vim-5.3-extra.tar.gz and commit)
git checkout -b vim-5-4 v5.4; (unpack vim-5.4-extra.tar.gz and commit)
git checkout -b vim-5-5 v5.5; (unpack vim-5.5-extra.tar.gz and commit)

git replace --graft vim-5-0 v4.6
git replace --graft vim-5-1 vim-5-0
git replace --graft vim-5-2 vim-5-1
git replace --graft vim-5-3 vim-5-2
git replace --graft vim-5-4 vim-5-3
git replace --graft vim-5-5 vim-5-4
git replace --graft vim-5-5-import^ vim-5-5

git tag -f v5.0 vim-5-0
git tag -f v5.1 vim-5-1
git tag -f v5.2 vim-5-2
git tag -f v5.3 vim-5-3
git tag -f v5.4 vim-5-4
git tag -f v5.5 vim-5-5

git filter-branch -- --all

[1] vim-5.2-extra.tar.gz doesn't exist. So I unpacked vim-5.3-extra.tar.gz then applied vim-5.2-5.3-extra.diff.gz reversely.

from vim-history.

Related Issues (2)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.