Can I squash the merge created by "git subtree add"?

2016-11-16 Thread Kannan Goundan
When I do a "git subtree add", I get two commits. df7e8f5 Merge commit '6de34775ea846c90e3f28e9e7fdfe690385c068b' as 'go/src/gopkg.in/ns1/ns1-go.v1' 6de3477 Squashed 'go/src/gopkg.in/ns1/ns1-go.v1/' content from commit 1d343da Unfortunately, in the environment I'm currently working in,

"git push" says "src refspec XYZ matches more than one" even without explicit XYZ argument.

2016-10-27 Thread Kannan Goundan
1. My repo has a branch named 'v1' that is tracking 'origin/v1'. 2. My repo has a tag named 'v1'. 3. I have "push.default" set to "upstream". I made a commit on branch 'v1' and tried doing a push: # git push error: src refspec v1 matches more than one. error: failed to push some refs

Re: Make "git checkout" automatically update submodules?

2015-10-23 Thread Kannan Goundan
Stefan Beller google.com> writes: > [1] https://github.com/jlehmann/git-submod-enhancements/wiki Oh wow, Christmas came early! I'll give this code a try. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info

Re: Make

2015-10-22 Thread Kannan Goundan
Thanks for the explanation. I didn't realize some projects don't want to initialize all their submodules, but the explicit opt-in idea you described sounds nice. I've seen cases where people will financially "sponsor" feature development in open source projects. Is there any precedent for this

Re: Make "git checkout" automatically update submodules?

2015-10-22 Thread Kannan Goundan
Junio C Hamano pobox.com> writes: > We are unfortunately not set up to handle money well. For a > background explanation, please go read [*1*], which I wrote my take > on "money" some time ago. Note that it is an explanation and not a > justification. It explains why we are not set up to

Make "git checkout" automatically update submodules?

2015-10-15 Thread Kannan Goundan
Git submodules seem to be a great fit for one of our repos. The biggest pain point is that it's too easy to forget to update submodules. 1. I often forget since most repos don't need it. 2. Infrequent users of our repo almost never know to update submodules and end up coming to us with strange