diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-12-13 17:32:38 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-12-13 17:33:00 -0500 |
| commit | 18e5cfff041b38155791a01e747b3cf2916c4ef0 (patch) | |
| tree | b5feee7992e1d10d8c05f70510b081d306da5c25 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | ceee97c038c9b0ec48409d3b3313cb77c2543309 (diff) | |
| parent | 3170d617ef7618a27cacf2eabac3ce3ea9d5a7c4 (diff) | |
Merge branch 'crossOverlays-for-18.09' (early part) into tempory branch
This was an early "pre-release" to stable, with a warning that the
interface is not stable yet (thought we don't actually expect it to
change).
We do expect to make many static build fixes, however, which should go
to master and staging, so we merge the cherry-picks back into master so
we can do those fixes against:
git merge-base upstream/master upstream/release-18.09
and merge into both master and release-18.09. This is easier than
cherry-picking when one knows in advance they are targeting multiple
branches.
No files should be changed with this merge.
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions