Merge pull request #427 from che-incubator/commnds-for-alignment-with…

…-upstream

Add commands for alignment che-code with upstream

devfile.yaml

@@ -97,3 +97,32 @@ commands:
         podman build -f build/dockerfiles/assembly.libc.Dockerfile -t che-code .
       group:
         kind: run
+  - id: install-git-subtree
+    exec:
+      label: Install git-subtree
+      component: dev
+      workingDir: ${PROJECTS_ROOT}
+      commandLine: |
+        mkdir temp && cd temp
+        git clone https://github.com/git/git.git
+        cd git/contrib/subtree
+        make && make prefix=${PROJECTS_ROOT}/temp install
+        cp -r ${PROJECTS_ROOT}/temp/libexec/git-core/ ~/bin
+        rm -rf ${PROJECTS_ROOT}/temp
+  - id: add-remote-upstream
+    exec:
+      label: Add remote for upstream
+      component: dev
+      workingDir: ${PROJECTS_ROOT}/che-code
+      commandLine: |
+        git remote add upstream-code https://github.com/microsoft/vscode
+        
+  - id: fetch-upstream-changes
+    exec:
+      label: Fetch upstream changes
+      component: dev
+      workingDir: ${PROJECTS_ROOT}/che-code
+      commandLine: |
+        git stash save --include-untracked
+        git fetch upstream-code main
+        ./rebase.sh