I would like to generate a patch (using git diff) of secrets files or folders in the .gitignore file that I won't versioning so that I can easily conf ...
I would like to generate a patch (using git diff) of secrets files or folders in the .gitignore file that I won't versioning so that I can easily conf ...
I became aware of this because a pre-commit config started checking for the trailing-whitespace condition (the generated diff in question is itself pa ...
We have hundreds of repositories and receive patches regularly from the upstream. A job applies these patches with git apply --check <patch>. If ...
I have a 3 month old commit, lets say commit A which touchs 3 files Over the last 3 months, a lot more commits have gone in, some of which have added ...
I ran the following command to apply a patch, and in the first attempt, it spitted a couple of errors saying patch apply failed for these files, and a ...
I'm looking for a way for apply my stash patching it in order to see what I'm applying step by step. If I do git stash apply 0 automatically merg ...
The git diff command (with the --no-index flag) works incredibly well to diff two files, irrespective of whether or not these two files are contained ...
Let's say I have a local repo and made some changes - some were added to the index while some were only tracked but left in the workspace without bein ...
I have two sepearate git repos: A and B. Some repository B files are already present in a subfolder of project A. My goal is to create patches for rep ...
I'm trying to learn git patching, so I set up a test repo and made a few commits. I then created a patch: git format-patch -1 HEAD --stdout > chan ...
git version 2.19.0 I have two commits for file 'myfile' I am cherry picking from one branch to another branch. During the last patch apply, I get "er ...
I needed to edit a messy commit commit that only changed a word in a few subsequent rows, keeping some of those changes and removing others. The chang ...
I have a reason¹ to create my git commits as patch files using git-format-patch with the --no-prefix option. This option changes the patch output to ...
I created a diff file by a command: git --no-pager diff --no-index --stat pathA pathB >\diff.log Nextly, I executed a command: git apply ...
Is there a way to apply diff without Linux (have no permissions on work) or windows tools like WinMerge or (again have no permissions to install). The ...
git mergetool is wonderful (in my case, I use kdiff3). However, it is not possible to use it to resolve conflicts from git am or git apply (or even wi ...
I have a bash script that applies all git patches in a directory (See bottom for the script). This script is run everytime I deploy my website on my s ...
I have the following patch When I use git apply a 2nd time the patch does not fail to apply, instead it just appends it at the same line. Is there ...
I have debug code for couple situations. I store it in stashes. They touches many files. Sometimes in process of coding I need to do debug stash apply ...
I am trying to do the following in C#: Get the difference between two branches. Redirect the output in a patch file. Checkout a new empty b ...