Tag: git submodules

git: stop warning me about changes in submodule

I have a git submodule which is constantly showing “modified” in git status even though I never update it. # On branch master # 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) # (commit or […]

How to use a git repository as a svn:external?

SVN offers external source link via svn:external feature. And I’m using a module from a Git repository. Can I use this Git repository as an external source? My module Git repository is in Github. So Github specific way is also welcome.

How to make an existing directory within a git repository a git submodule

I’m very confused about git-submodules. Basically my problem is that I can’t make git understand that ~/main-project/submodule is a submodule. I have good experience with git submodules: in my dotfiles repository I created the .gitmodules file in ~/dotfiles-repo and I added there paths and urls. Since then, If I make changes to the files within […]

Multiple GIT projects in a folder

I have a cpp folder with all the libraries and programs ordered like so cpp/libraries cpp/programs cpp/programs/proj1 cpp/programs/proj2 cpp/testing/ Until now, it was quite ok to use one big cpp git, which just had everything in it. However, because I do more than one project at a time at the moment, it has become rather […]

Unable to push to heroku after removing submodule

I removed a submodule from my code, when I try to push to heroku now, I get: remote: Git submodules detected, installing: remote: No submodule mapping found in .gitmodules for path ‘submodule/path’ remote: remote: ! Push rejected, submodule install failed remote: I am using Heroku’s buildpack: https://github.com/heroku/heroku-buildpack-multi.git With this .buildpacks file: https://github.com/ello/heroku-buildpack-imagemagick-cedar-14 https://github.com/heroku/heroku-buildpack-ruby.git Is there […]

Deploying a git submodule with Capistrano 3

My project repo includes WordPress as a git submodule. When deploying via Capistrano 3, the submodule directory is barren. project –wordpress –images I am using git and :deploy_via, :remote_cache How can I tell Capistrano to also deploy the submodule?

git submodules: customization

When using git submodules, what is the preferred way of doing customizations? Should I… fork the project and track the fork attempt to override the default behavior make the changes locally If none of these makes sense, then what does?

Git Merge conflict in submodule. I just want to commit with their version. How?

Basically I have read the git merge conflicts guide, and I’m not sure it directly addresses my situation. I have a conflict in submodules, and I just want to go with their version which I understand is git diff -3 app/bundles How do I just go with there version of the submodule, resolve the conflict […]

git submodules are ruining my day

Currently I am trying to clone this git repo: https://github.com/twilio/OpenVBX into my main repo, as though it was a directory. The issue lies, in it that when I try to commit the main repo with git add ., nothing in the sub dir (submodule) gets committed, and when I try to git add path/to/file it […]

Host key verification failed Xcode with Mavericks Server

I’m trying to get a CI setup going and have got Mavericks server downloaded and linked with Xcode all on one machine. Here’s the set up: Two git repos, hosted on OS X server, named CI and CISubmodule. CISubmodule added as a submodule to CI Every time I add bot I get a Host key […]

Git Baby is a git and github fan, let's start git clone.