aboutsummaryrefslogtreecommitdiff
path: root/cabal-plan/.gitrepo
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2018-12-02 19:58:14 +0100
committerDaniel Gröber <dxld@darkboxed.org>2019-01-22 03:06:51 +0100
commit132f65e0ca0fc54b1f457216af82b2da0c325be1 (patch)
tree6c16abf6f0cd823d6bbd4b258d5eb21303b54745 /cabal-plan/.gitrepo
parentb7177f8b7f972258eb4fa72217d2896d8a45849a (diff)
git subrepo push --branch=target-selector cabal-plan
subrepo: subdir: "cabal-plan" merged: "e36c8ca" upstream: origin: "../cabal-plan" branch: "target-selector" commit: "e36c8ca" git-subrepo: version: "0.4.0" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "5d6aba9"
Diffstat (limited to 'cabal-plan/.gitrepo')
-rw-r--r--cabal-plan/.gitrepo6
1 files changed, 3 insertions, 3 deletions
diff --git a/cabal-plan/.gitrepo b/cabal-plan/.gitrepo
index 22e29c4..d0ddadd 100644
--- a/cabal-plan/.gitrepo
+++ b/cabal-plan/.gitrepo
@@ -5,8 +5,8 @@
;
[subrepo]
remote = ../cabal-plan
- branch = master
- commit = cd93de6ab26a15383ea9bea3005cec486be9af95
- parent = afed7936ebb2ace14bc93535019b638130b451ab
+ branch = target-selector
+ commit = e36c8ca8d4a2efd1dc83d5fd1f0193ebff3840b9
+ parent = ee2f7ab509bdfbad38d54691cf781c08cdba9792
cmdver = 0.4.0
method = merge