This thread post** offers a very good explanation: This is by design. While the git data structure can technically store unix mode bits in its trees, it was found early on in git’s history that respecting anything beyond a simple executable bit ended up being more cumbersome for git’s normal use cases (i.e., people storing … Read more
It can be shared via a dedicated branch. You want to stop if there is a conflict on that branch and resolve it as it means that there were attempts to solve the same conflict in 2 different ways. Needless to say, that will be the exception to the rule. For the others on this … Read more
It isn’t the responsibility of the commit command to decide how to treat whitespaces, but the responsibility of the blame command because it is blame which analyzes the differences between versions to get the author of each line. So searching for an option to ignore whitespace in blame: The option -w is defined as: “Ignore … 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
I thought the answer by @codewizard was the correct one. Seems VS Code uses ‘id_rsa.pub’ key only, it was not using my other ssh key pair that git.exe was configured to use.(This key wasn’t name id_rsa.) However after generating a new id_rsa key pair, I still got permission denied (publickey). I Found my answer on … Read more
TL;DR The new-in-Git-2.30 –force-if-includes does nothing unless you also include –force-with-lease. If you do use –force-with-lease, that alone can suffice. I’m not convinced of the utility of –force-if-includes myself and would personally use a multi-step process: git fetch <remote> # get commit(s) from remote git show <remote>/<name> # inspect their most recent commit # to … Read more
There does not seem to be a solution producing individual commits à la git format-patch, but FWIW, you can format a patch containing the effective merge commit, suitable/compatible with git am: Apparently, the Git Reference guide provides the first hint: git log -p show patch introduced at each commit […] That means for any commit … Read more
You can make git blame ignoring certain commits, which do only mass reformatting etc.: Create a file .git-blame-ignore-revs like: # Format commit 1 SHA: 1234af5….. # Format commit 2 SHA: 2e4ac56….. Then do git config blame.ignoreRevsFile .git-blame-ignore-revs , so that you don’t have to use the –ignore-revs-file option every time with git blame. Upvote https://github.com/github/feedback/discussions/5033 … Read more
Git1.6.0.4 seems a bit old, especially if you consider that: in 1.6.3.4, “git apply –whitespace=fix” did not fix trailing whitespace on an incomplete line in 1.6.3.2, “whitespace” attribute that is set was meant to detect all errors known to git, but it told git to ignore trailing carriage-returns. Could you try with Git1.6.4.1, and rather … Read more