From the root of the repo just run:

    git submodule update --init

If you need to pull stuff for submodules into your submodule repositories use

    git pull --recurse-submodules

But this will not checkout proper commits(the ones your master repository points to) in submodules

To checkout proper commits in your submodules you should update them after pulling using

    git submodule update --recursive

If there are nested submodules, you will need to use:

```git
git submodule update --init --recursive
```

I just want to share these.

First way,      

```
git submodule init &amp;&amp; git submodule update
```

The below is just basically combining the first way,      

```
git submodule update --init
```

If there are any nested submodules, [Iglesk&#39;s answer](https://stackoverflow.com/a/57920691/15393232) is the way to go.

I&#39;m trying to get Vim to highlight non-ASCII characters. Is there an available setting, regex search pattern, or plugin to do so?



How to get Vim to highlight non-ascii characters?

**Please note:** Answer edited after Xavier&#39;s Answer

I am trying to use different [Build Flavors][1] for one same Application project in Android Studio. However, I seem to be having a terrible time configuring it to work appropriately. 

**Steps:** 

1. Create a new Android Studio Project, named &#39;Test&#39;. 
2. Open build.gradle* and added the following lines: 

        productFlavors {
        flavor1 {
            packageName &#39;com.android.studio.test.flavor1&#39;
            }
        flavor2 {
            packageName &#39;com.android.studio.test.flavor2&#39;
            }
        }
3. After restarting Android Studio, I now see **4 build variants** under the Build Variants section. Meaning we were succesful on seting up the product flavors so far. **
4. Created a new Source folder for **flavor1**; however, I am not sure if I&#39;m doing it the right way. Here&#39;s how I did it: 

* Keep in mind that my Package name for this project is: &lt;code&gt;com.foo.test&lt;/code&gt;
* Right click on the &lt;code&gt;src&lt;/code&gt; folder, for flavor1, I actually created the individual folders in the explorer, in a way that the structure is &lt;code&gt;src/flavor1/java/com/foo/test/MainActivity.java&lt;/code&gt;. 
* The above worked well, since the &#39;java&#39; folder is in **blue**, meaning the IDE knows its an active source directory. Also, the package was automatically created. Despite of this, I am getting a warning for duplicate class found. [See screenshot here.][2] 
* For flavor2, I tried creating the package manually, but &#39;src&#39; folder for flavor2 seems not be in blue, and therefore the options are different when right clicked, and &#39;New Package&#39; is not available for me to use. [See image here.][3] 
* Note that for flavor1, I also created a &#39;res&#39; directory, which does turn blue, but despite of that, doesn&#39;t offer the ability to create either an Android Resource file, or Andorid resource directory, in case I wanted to use different resoruces for different flavors. 

Am I doing something wrong? Or am I missing something? Let me know if you need more info. 

*My Project seems to have **two** build.gradle files. One located on the root of the project folder (\GradleTest), this one is empty. The second one located on the root of a subfolder of \GradleTest, also labeled &#39;GradleTest&#39; (GradleTest-GradleTest), this is the one that already had code when opened; therefore, that is the one I edited. 

** I checked gradle settings and apparently **Use auto-import** was [already enabled.][4] Despite of this, making changes to the build.gradle file [doesn&#39;t automatically update][5] the build variants. **Note:** I also tried using Build - Rebuild Project, and/or Build - Make Project, no-go. I still have to close the project, and re-open for changes to take effect. 


  [1]: http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Product-flavors
  [2]: http://db.tt/HTyvf4AP
  [3]: http://db.tt/nU5oXbS1
  [4]: http://db.tt/hKd951HK
  [5]: http://db.tt/qCWXEi2V

Using Build Flavors - Structuring source folders and build.gradle correctly

I have a project that has specified submodules in it. Everything works well on the dev machine. I have commited `.gitmodules` file and pulled on the production. However it does not pulled submodules.

If I go into submodule directories and call `git pull`, nothing happens.

What is the proper way to pull those submodules in the new project ?

Pull git submodules after cloning project from GitHub

I have a project that has specified submodules in it. Everything works well on the dev machine. I have commited <code>.gitmodules</code> file and pulled on the production. However it does not pulled submodules.
If I go into submodule directories and call <code>git pull</code>, nothing happens.
What is the proper way to pull those submodules in the new project ?

I&#39;m using (Windows) SourceTree for my git project. I can do it in either command prompt or Linux terminal.

But, I&#39;m wondering whether there is a nice way to interactively and visually resolve conflicts. For example, if pull detects conflicts, popping up a GUI-based conflict tool (e.g., P4Merge). Is it possible?

I am always doing manual conflict resolving, which is just painful.

This is, for example, a git `pull` message, from SourceTree.


    git -c diff.mnemonicprefix=false -c core.quotepath=false pull --no-commit origin master
    From W:\repo\
     * branch            master     -&gt; FETCH_HEAD   
    
    Updating 33c07bf..41e0249
    
    error: Your local changes to the following files would be overwritten by merge:
    	foo.cpp
    	goo.cpp
    	goo.hpp
    Please, commit your changes or stash them before you can merge.
    Aborting    
    
    Completed with errors, see above.



How to interactively (visually) resolve conflicts in SourceTree / git

I ran `git cherry-pick &lt;hash&gt;` and had merge conflicts. I don&#39;t want to resolve the conflicts, I just want to abort the cherry-pick. When doing an actual merge (with `git merge`) there&#39;s the handy `git merge --abort`. What&#39;s the equivalent for cherry-picking?

Abort a git cherry-pick?

I&#39;m trying to put an existing project under Git source control, but I&#39;m unclear on several things.

I have set up a &#39;Team Foundation Service&#39; Git account online.

I currently have an ASP.NET MVC 4 solution - in my Projects folder. I have created a Git &#39;repository&#39; locally (an empty folder currently). Should this just be my current application folder in Projects? Or does it need to be a copy?

How do I get my existing files into the online repository?



Git in Visual Studio - add existing project?

I am in the middle of rebasing after a `git pull --rebase`.  I have a few files that have merge conflicts.  How can I accept &quot;their&quot; changes or &quot;my&quot; changes for specific files?

    $ git status
    # Not currently on any branch.
    # You are currently rebasing.
    #   (fix conflicts and then run &quot;git rebase --continue&quot;)
    #   (use &quot;git rebase --skip&quot; to skip this patch)
    #   (use &quot;git rebase --abort&quot; to check out the original branch)
    #
    # Changes to be committed:
    #   (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
    #
    #       modified:  CorrectlyMergedFile
    #
    # Unmerged paths:
    #   (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
    #   (use &quot;git add &lt;file&gt;...&quot; to mark resolution)
    #
    #       both modified: FileWhereIWantToAcceptTheirChanges
    #       both modified: FileWhereIWantToAcceptMyChanges

Normally I just open the file or a merge tool and manually accept all &quot;their&quot; or &quot;my&quot; changes.  However, I suspect I&#39;m missing a convenient git command.

Also, note that I will only be able to choose a merge strategy for each file when I see what files hit conflicts an possibly what the conflicts are.

Choose Git merge strategy for specific files (&quot;ours&quot;, &quot;mine&quot;, &quot;theirs&quot;)

I have searched and read few post but my problem is not the same as described. So here&#39;s the issue: using `git clone` into folder under external partition of the disk works fine but all git commands fails. can&#39;t execute `git status` or `git log`... I always get error


```
fatal: Not a git repository (or any parent up to mount parent /home/kozi)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
```
Please help me out..

&gt; .  
├── abi  
├── bionic  
├── bootable  
├── build  
├── cts  
├── dalvik  
├── development  
├── device  
├── docs  
├── external  
├── frameworks  
├── gdk  
├── hardware  
├── libcore  
├── libnativehelper  
├── ndk  
├── packages  
├── pdk  
├── prebuilts  
├── .repo  
├── sdk  
├── system  
└── tools  




GIT_DISCOVERY_ACROSS_FILESYSTEM not set

When I run `git submodule init`, I get the following error:

&gt;No submodule mapping found in .gitmodules for path &#39;xxx&#39;

I searched for a `.gitmodules` file and I cannot find it anywhere.

I have read [this](https://stackoverflow.com/questions/4185365/no-submodule-mapping-found-in-gitmodule-for-a-path-thats-not-a-submodule) most popular SO question on the same topic. 
But unfortunately, I cannot solve the problem. Especially given that I no longer have `.gitmodules`.

According to my GitHub private repo, I still have submodules for my repository. Just that I cannot find the `.gitmodules` file anywhere.

No submodule mapping found in .gitmodules for path and missing .gitmodules file

I have a web application that explores other web applications in a particular way. It contains some web demos in a `demos` folder and one of the demo should now have it&#39;s own repository. I would like to create a separate repository for this demo application and make it a &lt;del&gt;subpackage&lt;/del&gt; [submodule][1] from main repository without losing its commit history.

*Is it possible to keep the commit history from the files in a repository&#39;s folder and create a repository from it and use it as a [submodule][1] instead?*

  [1]: http://git-scm.com/book/en/Git-Tools-Submodules

Create a submodule repository from a folder and keep its git commit history

I am using Git submodules. After pulling changes from server, many times my submodule head gets detached from master branch. 

Why does it happen?

I have to always do:

    git branch
    git checkout master

How can I make sure that my submodule is always pointing to master branch?


Why is my Git Submodule HEAD detached from master?

What is the difference between running 

    git submodule update --remote
vs 

    cd &lt;submodule directoy&gt;
    git pull

Assuming that the submodule was previously set to track some branch:

    git submodule add -b master [URL to Git repo]


git submodule update --remote vs git pull

I have a project that contains many submodules. I want to loop over each submodule with the following command:

`git submodule foreach npm install`

And I want the script to continue looping over each submodule even if one submodule returns an error (non zero return code). Currently, a non-zero return code from running this command in any submodule will cause git to stop looping over the remaining submodules.

Any recommendations on how to accomplish this?

Content Type	Original Author	Original Content on Stackoverflow
Question	hsz	View Question on Stackoverflow
Solution 1 - Git	Matt Cooper	View Answer on Stackoverflow
Solution 2 - Git	S. Rasel	View Answer on Stackoverflow
Solution 3 - Git	Iglesk	View Answer on Stackoverflow
Solution 4 - Git	mufidu	View Answer on Stackoverflow

Pull git submodules after cloning project from GitHub

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Using Build Flavors - Structuring source folders and build.gradle correctly

How to get Vim to highlight non-ascii characters?

Attributions