Nothing would happen, but your next push would be not accepted. Unless you would force push. This would not break remote repository also, so it is also not that bad. Things go bad when you have more people using this repo. Rewriting history can cause a bit of chaos for others who will pull new … Read more
This depends in part how you’ve done your 100+ commits and what’s been happening in the meantime. Four strategies might be useful: Reduce the number of commits to rebase If you have a beautiful clear stream of 100 commits that never modify the same code twice, I’m sorry, but you are stuck. However, from 100 … Read more
When from my branch MyBranch and doing a rebase like git rebase master and having a conflict which is incoming change? and which is current change? When rebasing MyBranch onto master, “incoming” is the branch you have checked out, which is MyBranch, and “current” is master. The reason is because of what rebase actually does … Read more
2022: I described last August in “Git interactive rebase: how to move other branches (refs) automatically?” a new rebase option –update-refs (Git 2.38, Q3 2022): Automatically force-update any branches that point to commits that are being rebased. Any branches that are checked out in a worktree are not updated in this way. branch1 branch2 | … Read more
All git commits have a committer field internally; you can see this by typing git cat-file commit HEAD immediately after committing something. As such you cannot erase it; you can only make it equal to the author field. That said, you might be seeing git porcelain showing the commit field because the datestamp has changed. … Read more
According to your answers in the comments, executing git diff HEAD^ will not help you, except if you only want to reword the last commit. But in this case a rebase is the wrong tool anyway. Instead you can simply do git commit –amend –verbose without changes in the index and then edit the commit … Read more
Please don’t remove the .git/svn folder to fix this. It requires you to rebuild everything, it is annoying, it will take awhile (for the size of my repo several hours) and it is NOT NECESSARY. I found the right answer here and I’ve included it below. From the link: Inside the .git directory run the … Read more
I’ve managed to work around this by: Locate the last commit that retained the order Run git rebase -i <hash of that commit> Replace all pick with reword Run git push -f Before that, I tried changing only the first commit message, which also changes all the following hashes, but that didn’t fix it. I … Read more
Git makes it hard to lose work. Run: git reflog Than look for the commit that was just before the rebase Then check it out git checkout <sha> Look around, is it the version you wanted to recover? If so, create a branch here git checkout -b mybranch
The idea is you use one common branch, and two (or as many as you need) customer specific branches. All common changes go into the master, and each customer branch gets changes that pertain only to that customer. Periodically (when master is considered to be at a stable point), you’ll merge changes from master into … Read more