Changes between Version 75 and Version 76 of HowToGit

Timestamp:

Oct 23, 2019, 7:52:43 AM (5 years ago)

Author:

neteler

Comment:

Applying a diff file locally

HowToGit

@@ -140 +140 @@
 !GitHub provides command line instructions under each pull request ([https://github.com/OSGeo/grass/pulls "Pulls" tab]). Please check there.
 
+=== Applying a diff file locally ===
+
+Patching local repo with `git`:
+
+{{{
+# first the stats about the patch (see what would be changed)
+git apply --stat  grass_code_changes.diff
+
+# dry run to detect errors (should be none):
+git apply --check grass_code_changes.diff
+
+# apply patch locally, continue committing as usual
+git am < grass_code_changes.diff
+
+# FYI - undo a local patch:
+git am --abort  < grass_code_changes.diff
+}}}
 == Fixing bugs in a release branch ==