Re: [GRASS-dev] git howto get a single diff for a PR with multiple commits
Hi, On Wed, Jun 5, 2019 at 2:28 PM Markus Metz wrote: > On Wed, Jun 5, 2019 at 7:51 AM Peter Petrik > wrote: > > Hi, > > > > you can diff the branch agains the branch origin point (see eg > > https://stackoverflow.com/questions/29810331/is-there-a-quick-way-to-git-diff-from-the-point-or-branch-origin). > > For example if you PR 28 is on local branch pr_28, branched from master > > you can do: > > > > git checkout pr_28 > > git diff master... > > that's exactly what I was looking for, thanks! Thanks, I have taken liberty to add the trick to https://trac.osgeo.org/grass/wiki/HowToGit#Codereview:generateasinglediffforaPRwithmultiplecommits markusN ___ grass-dev mailing list grass-dev@lists.osgeo.org https://lists.osgeo.org/mailman/listinfo/grass-dev
[GRASS-dev] GRASS GIS at FOSS4G
Hi everyone, It seems that we have one workshop accepted on TGRASS, plus the general "state of the project" presentation, plus several others where GRASS GIS is used in different forms. Sounds like a nice programme ! I will be in Bucharest from Sunday, Aug 25 afternoon, until Saturday, Aug 31, mid-day. The TGRASS workshop is on August 27, 14:00 - 18:00. I was wondering: - Who else will be in town at the beginning of the week ? - Should we organise some form of small GRASS sprint on Monday and Tuesday ? - Have you all booked housing already ? If not, should we try to find some place (e.g. appartment) which could also be a place to work together, or should we ask whether a room might be available at the FOSS4G premises ? What do you think ? Moritz ___ grass-dev mailing list grass-dev@lists.osgeo.org https://lists.osgeo.org/mailman/listinfo/grass-dev
[GRASS-dev] [QGIS-Developer] Why does the QGIS 3 OSGeo4W Shell Default to Python 2
see https://lists.osgeo.org/pipermail/qgis-developer/2019-June/057557.html - Hi Calvin, On Tue, 04. Jun 2019 at 14:22:19 -0400, C Hamilton wrote: > Why does the QGIS 3 OSGeo4W shell default to python 2 when QGIS is running > python 3? I have had users get confused with this and it makes no sense to > me. For that matter why is python 2 still a part of the QGIS 3 > application? grass still required python2. Jürgen - https://trac.osgeo.org/grass/ticket/3855 anything other needed to bring back winGRASS daily builds for testing py3-winGRASS - best regards Helmut -- Sent from: http://osgeo-org.1560.x6.nabble.com/Grass-Dev-f3991897.html ___ grass-dev mailing list grass-dev@lists.osgeo.org https://lists.osgeo.org/mailman/listinfo/grass-dev
Re: [GRASS-dev] git howto get a single diff for a PR with multiple commits
On Wed, Jun 5, 2019 at 7:51 AM Peter Petrik < peter.pet...@lutraconsulting.co.uk> wrote: > > Hi, > > you can diff the branch agains the branch origin point (see eg https://stackoverflow.com/questions/29810331/is-there-a-quick-way-to-git-diff-from-the-point-or-branch-origin). For example if you PR 28 is on local branch pr_28, branched from master you can do: > > git checkout pr_28 > git diff master... that's exactly what I was looking for, thanks! Markus M > > P. > > > > On Wed, Jun 5, 2019 at 6:44 AM Ken Mankoff wrote: >> >> >> On 2019-06-04 at 23:12 +02, Markus Metz wrote... >> > I would like to speed up reviewing of a PR with multiple commits by >> > reading a single diff file. How is this possible with git? [...] can >> > git (on CLI on my local copies) also do this? >> >> I think git can diff any two commits. Do this by providing two commit hashes instead of just one (which defaults to that v. the currently checked out hash + any local changes). >> >> -k. >> ___ >> grass-dev mailing list >> grass-dev@lists.osgeo.org >> https://lists.osgeo.org/mailman/listinfo/grass-dev ___ grass-dev mailing list grass-dev@lists.osgeo.org https://lists.osgeo.org/mailman/listinfo/grass-dev
