Commit Graph

10 Commits

Author SHA1 Message Date
Kenneth Moreland
54b543c92e Merge branch 'upstream-GitSetup'
* upstream-GitSetup:
  GitSetup 2017-10-23 (34f17af6)
2017-10-23 15:35:29 -06:00
Allison Vacanti
e22a410885 Add python script that diffs VTKM benchmarks. 2017-09-26 16:49:25 -04:00
Kenneth Moreland
7d6c99b8ce Update git-gitlab-push to recent changes in GitSetup repo
The changes silence git rev-parse and support
Windows lease detection.
2017-09-21 09:19:12 -06:00
Kenneth Moreland
a0ba2765f7 Fix errors with variable names with hyphen in git setup scripts
Specifically, several of the git setup scripts defined a function
named "egrep-q". This almost always works, but I happened to have
an install of git on windows/cygwin that gave the error:

    `egrep-q': not a valid identifier

I always thought hyphens were allowed in script identifiers (and
usually they are), but apparently sometimes they are not. (See
for example
https://stackoverflow.com/questions/2821043/allowed-characters-in-linux-environment-variable-names).
This provides an easy fix by replacing egrep-q with egrep_q.
2017-09-19 10:40:51 -06:00
Robert Maynard
e91401ac0f Enable SetupForDevelopment in VTK-m 2017-06-07 10:02:38 -04:00
Robert Maynard
569655c454 Add autostash command flag to git-gitlab-sync 2017-06-07 10:02:38 -04:00
Robert Maynard
0f171de1c5 Add gitlab-sync command to ease updating local branches after reformats 2017-06-07 10:01:12 -04:00
Robert Maynard
c5d20ef7ba Merge branch 'upstream-GitSetup' into add_setup_for_development
* upstream-GitSetup:
  GitSetup 2016-12-13 (cd5ada6d)
2017-06-07 09:58:36 -04:00
Robert Maynard
7736f95050 Add the update scripts needed to import GitSetup 2017-06-07 09:43:50 -04:00
Kenneth Moreland
3ffd16a8a6 Add ability to get VTK-m version from git
In addition to keeping the version number accurate, this will help us
differentiate between-the-numbers commits.
2017-01-26 10:02:04 -07:00