How can you combine git add patch -p mode with diff’s ignore-all-space

Here’s an adaptation from a related question. git diff -w –no-color | git apply –cached –ignore-whitespace It has the benefit that you don’t need to use stash, temporary files, or perform a reset –hard on your working folders. Addendum The solution above only stages changes except whitespace-only edits. This did not address patch, though using … Read more

What is the difference between patches vs patchesJson6902 in Kustomize

The explanation for this is here. To summarize, patchJson6902 is an older keyword which can only match one resource via target (no wildcards), and accepts only Group-version-kind (GVK), namespace, and name. The patches directive is newer and accepts more elements (annotation selector and label selector as well). In addition, namespace and name can be regexes. … Read more

A visual patch tool for Linux

I really like Kompare. It is just a (very nice) graphical interface for diff. http://www.caffeinated.me.uk/kompare/ sudo apt-get install kompare Creating and applying patches Kompare is able to create a patch file which lists only the differences between two compared text files A and B. Further, Kompare can apply a patch file which was created this … Read more

Patch vs. Hotfix vs. Maintenance Release vs. Service Pack vs

When I hear those terms this is what comes to mind: Patch – Publicly released update to fix a known bug/issue Hotfix – update to fix a very specific issue, not always publicly released Maintenance Release – Incremental update between service packs or software versions to fix multiple outstanding issues Service Pack – Large Update … Read more

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)