Changes between Version 77 and Version 78 of HowToGit

Timestamp:

Nov 3, 2019, 8:00:38 AM (5 years ago)

Author:

neteler

Comment:

example improved

HowToGit

@@ -142 +142 @@
 === Applying a diff file locally ===
 
-Patching local repo with `git`:
+Downloading a pull request as a diff file (example):
+
+{{{
+cd path/to/grass_git/
+
+# use the PR number and simply add .diff to the URL
+wget https://github.com/OSGeo/grass/pull/174.diff
+}}}
+
+Patching local repo with `git` (continuing with example diff):
 
 {{{
 # 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
+git apply --stat 174.diff
+
+# dry run to detect errors (should show no output, i.e. no errors):
+git apply --check 174.diff
 
 # apply patch locally, continue committing as usual
-git apply grass_code_changes.diff
+git apply 174.diff
 git status
-# ... commit etc.
-
-# FYI - undo a local patch:
+# ... now comment on PR in GitHub, etc.
+
+# FYI - here how to undo a local patch:
 git apply --reverse grass_code_changes.diff
 }}}