Changes between Version 54 and Version 55 of HowToGit

Timestamp:

06/05/19 14:35:07 (6 years ago)

Author:

neteler

Comment:

generate a single diff for a PR with multiple commits, from ​https://lists.osgeo.org/pipermail/grass-dev/2019-June/092781.html

HowToGit

@@ -229 +229 @@
 }}}
 
+== Code review: generate a single diff for a PR with multiple commits ==
+
+To speed up reviewing of a PR with multiple commits by reading a single diff file, you may diff the branch against the branch origin point. For example, if you PR 28 is on local branch pr_28, branched from master, you can do:
+
+{{{
+git checkout pr_28
+
+# note: with the three dots, it will only show diffs from changes on your side:
+git diff master...
+}}}
+
+For more hints, see e.g. this [https://stackoverflow.com/questions/29810331/is-there-a-quick-way-to-git-diff-from-the-point-or-branch-origin Stackoverflow discussion].
+
 == Merging of Pull Requests ==