How do I apply rejected hunks after fixing them? - Stack Overflow
Jul 26, 2013 · How do I apply rejected hunks after fixing them? Asked 12 years, 9 months ago Modified 10 years, 2 months ago Viewed 51k times
Add patch in git, all hunks matching regex in file
Nov 2, 2012 · Is there a way to add all hunks in a file matching a regex? I know I can search for a given hunk with /, but that only finds the first. I want to add all matching.
In the context of git (and diff), what is a "hunk" - Stack Overflow
Jun 6, 2017 · I was looking for a definition of "hunk" while reading some git documentation. I know it means a description of the difference between two files and that it has a well defined format, but I coul...
"git apply" gives error "does not match index" when a previous apply ...
Feb 16, 2019 · Thank you! Using your advice I started clean and ran "git apply --reject commit1.patch", then "git apply commit2.patch". Finished with no errors and skipped two hunks in patch 1 as expected.
git add --interactive "Your edited hunk does not apply"
Jul 17, 2010 · After you edit the hunk, git attempts to verify the patch by checking that all hunks will apply (this may be excessive). Unfortunately, in this case, that means the previous hunk (which you …
Commit only part of a file's changes in Git - Stack Overflow
When I make changes to a file in Git, how can I commit only some of the changes? For example, how could I commit only 15 lines out of 30 lines that have been changed in a file?
How can I selectively merge or pick changes from another branch in Git ...
What I want: Interactively pick hunks from a branch (which had several messy commits) into a clean commit in a new branch. git diff + git apply won't work if you had any binary files in that diff.
Hunk #1 FAILED at 1. What's that mean? - Stack Overflow
Hunks order also matter. If the code they have patch in a file comes before lines that were already previously handled (kinda impossible for this to happen if you have just freshly made yourself the …
Git interactive unstage part of a file or by hunks
Sep 7, 2011 · There's git add -p to stage changes and git checkout -p to discard changes interactively. How can I unstage changes from index by hunks? (I thought that git unstage -p or git reset HEAD -p …
How do i move partial changes (hunks) between commits?
Jul 12, 2017 · if i have two commits with a distance of many commits between them, with many files committed in both of them, how is it best to move a hunk from one to the other, for example: in …