check out the git-update-index man page and the –assume-unchanged bit and related. when I have your problem I do this git update-index –assume-unchanged dir-im-removing/ or a specific file git update-index –assume-unchanged config/database.yml
TL;DR The difference between the commands is that one provides you with a tag message while the other doesn’t. An annotated tag has a message that can be displayed with git-show(1), while a tag without annotations is just a named pointer to a commit. More About Lightweight Tags According to the documentation: “To create a … Read more
NOTICE: This is never a recommended use of git. This will overwrite changes on the remote. Only do this if you know 100% that your local changes should be pushed to the remote master. ⚠️ Try this: git push -f origin master
git config –global core.editor “‘C:/Program Files/Notepad++/notepad++.exe’ -multiInst -notabbar -nosession -noPlugin” Or, for 64-bit Windows and a 32-bit install of Notepad++: git config –global core.editor “‘C:/Program Files (x86)/Notepad++/notepad++.exe’ -multiInst -notabbar -nosession -noPlugin” Or, the following can be issued on the command line on either 32-bit or 64-bit Windows. It will pull the location of notepad++.exe from … Read more
The answer is there, git is telling you to fetch first. Probably somebody else has pushed to master already, and your commit is behind. Therefore you have to fetch, merge the changeset, and then you’ll be able to push again. If you don’t (or even worse, if you force it by using the –force option), … Read more
If nobody has pulled your remote repo yet, you can change your branch HEAD and force push it to said remote repo: git reset –hard HEAD^ git push -f (or, if you have direct access to the remote repo, you can change its HEAD reference even though it is a bare repo) Note, as commented … Read more
While most people will tell you to just use multiple repositories, I feel it’s worth mentioning there are other solutions. Solution 1 A single repository can contain multiple independent branches, called orphan branches. Orphan branches are completely separate from each other; they do not share histories. git checkout –orphan BRANCHNAME This creates a new branch, … Read more
git apply –reject –whitespace=fix mychanges.patch worked for me. Explanation The –reject option will instruct git to not fail if it cannot determine how to apply a patch, but instead to apply the individual hunks it can apply and create reject files (.rej) for hunks it cannot apply. Wiggle can “apply [these] rejected patches and perform … Read more
you can simply pass the 2 commits to git diff like : -> git diff 0da94be 59ff30c > my.patch -> git apply my.patch
git blame -L 10,+1 fe25b6d^ — src/options.cpp You can specify a revision for git blame to look back starting from (instead of the default of HEAD); fe25b6d^ is the parent of fe25b6d. Edit: New to Git 2.23, we have the –ignore-rev option added to git blame: git blame –ignore-rev fe25b6d While this doesn’t answer OP’s … Read more