trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: February 2020

git modules and cmake/admin submodules

From: deloptes <deloptes@...>
Date: Sun, 16 Feb 2020 19:09:19 +0100
Hi,

can you help and advise how to proceed. I want to push a PR, but I have done
some changes on cmake.
I have never pushed such PR and I am a bit confused cause it seems cmake is
outside of the main package (kplayer).

I committed the changes for cmake in cmake and was thinking to commit iun
kplayer but got some doubts.


# repo-master/tde/1_git/tde/main/applications/kplayer$ git status
On branch issue/1/kplayer
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   cmake (new commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        .project

no changes added to commit (use "git add" and/or "git commit -a")
# repo-master/tde/1_git/tde/main/applications/kplayer$ git diff
diff --git a/cmake b/cmake
index 8668335..bcfb5b2 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 8668335711fa13cec276552d75bfbb4285c7edb0
+Subproject commit bcfb5b2b09fe32b35b65aee16697992648cd740e

Thanks in advance