git-rebase - w3toppers.com

Can tags be automatically moved after a git filter-branch and rebase?

I’ve written a script that does this. $ git-rebase-tags master Rebasing 107 tags onto ‘master’ Can’t rebase tag ‘staging-deploy-01’ because there are no identical commits on ‘master’ Pointed tag ‘v0.0.11’ at commit 81e16f2ca1bc7802547bf19c1dba1a68212eafff Pointed tag ‘v0.0.12’ at commit 17051cc28084dd56ae56e96767bceee46217c02d Pointed tag ‘v0.0.13’ at commit 5d795076ba4b33f81d327dcf9bff727cef7771a2 […] See gist.github.com/908381. But even better, use the –tag-name-filter option … Read more

Git rebase –preserve-merges fails

TL; DR The –preserve-merges flag simply tells git-rebase to try to recreate merge commits instead of ignoring them. It does not give git rebase the ability to remember how merge conflicts were resolved, i.e. it does not record conflict resolutions for future use. What you want to use for that is rerere. In your toy … Read more

How to retain commit gpg-signature after interactive rebase squashing?

Like Cupcake stated, you can’t retain the old signature from the unsquashed commits, but you can sign the new squashed commit if you rebase like this: git rebase –interactive –[email protected] HEAD~4 Adding –[email protected] as an argument will sign the final squashed commit.

What does “Auto packing the repository for optimum performance” mean?

Short version: it means what it says, and if you just let it finish, all will be well. During most operations which can potentially increase the number of loose (unpacked) objects in the repository (including pushes), Git invokes git gc –auto. If there are enough loose objects (by default, at least 6700), it will then … Read more

Git rebase branch with all parent branches (or dependent sub-branches)

According to git’s Object Model if you only change the meta-data of a commit (i.e. commit message) but not the underlying data (“tree(s)”) contained within it then it’s Tree hash will remain unchanged. Aside from editing a commit message, you are also performing a rebase, which will change the Tree hashes of each commit in … Read more

How to know if there is a git rebase in progress?

Update 2021: As I mentioned in “git stash is slow on windows“, with Git for Windows 2.19 (Sept. 2018), git stash (and git rebase) are no longer script-only, but actually a binary compiled with git.exe. Tim‘s answer illustrates how it is still difficult to ascertain if a rebase is in progress. That was discussed in … Read more

git rebase merge conflict

Rebasing can be a real headache. You have to resolve the merge conflicts and continue rebasing. For example you can use the merge tool (which differs depending on your settings) git mergetool Then add your changes and go on git rebase –continue Good luck

Git: How to rebase to a specific commit?

You can avoid using the –onto parameter by making a temp branch on the commit you like and then use rebase in its simple form: git branch temp master^ git checkout topic git rebase temp git branch -d temp

git rebase: “error: cannot stat ‘file’: Permission denied”

Try closing any programs that have the folder open, such as editors, explorer windows, command prompts, and FTP programs. This always fixes the issue for me on Windows.

Remove commit for good

I contacted Github staff from here : https://github.com/contact Here’s the answer (I couldn’t do anything about it, no prune, no gc, etc) Hey Maxime, The commit was available because commits are not automatically deleted when they’re removed from the history of a branch — they’re deleted when they’re garbage collected. I just ran garbage collection … Read more