Our great sponsors
-
Sometime ago I downloaded this repository and initiated a new git repository in the downloaded folder. Then I started adding my own commits, but now I'm missing the git blame from the old commits. So I want either to move my commits from my repository to the other repository but discarding the commits made after any of my commits. Or the other way around, importing the commits from the other repository to mine but only for the old commits made before my first commit. How can I do this? Would I have to manually resolve merge conflicts or can it be avoided?
-
WorkOS
The modern identity platform for B2B SaaS. The APIs are flexible and easy-to-use, supporting authentication, user identity, and complex enterprise features like SSO and SCIM provisioning.
Related posts
- nicknisi/dotfiles: vim, zsh, git, homebrew, neovim - my whole world
- How to keep track of installed coc-extensions between multiple computers?
- Load plugin configuration from a different file with packer.
- Is there a way to store a command line to fast use in Neovim?
- Show me your well organized vim config.