There&#39;s also an option:

    difftool.prompt
      Prompt before each invocation of the diff tool.

The following command turns off the prompt globally (for all repos):

    git config --global difftool.prompt false

Which is like writing in `~/.gitconfig`:  
(or in `%HOMEDRIVE%%HOMEPATH%\.gitconfig`)

    [difftool]
      prompt = false

    man git-difftool

    OPTIONS
       -y, --no-prompt
           Do not prompt before launching a diff tool.


I&#39;m working on a **multi-tenanted** application in which some users can define their own data fields (via the admin) to collect additional data in forms and report on the data.  The latter bit makes JSONField not a great option, so instead I have the following solution:

    class CustomDataField(models.Model):
        &quot;&quot;&quot;
        Abstract specification for arbitrary data fields.
        Not used for holding data itself, but metadata about the fields.
        &quot;&quot;&quot;
        site = models.ForeignKey(Site, default=settings.SITE_ID)
        name = models.CharField(max_length=64)
    
        class Meta:
            abstract = True

    class CustomDataValue(models.Model):
        &quot;&quot;&quot;
        Abstract specification for arbitrary data.
        &quot;&quot;&quot;
        value = models.CharField(max_length=1024)

        class Meta:
            abstract = True

Note how CustomDataField has a ForeignKey to Site - each Site will have a different set of custom data fields, but use the same database.
Then the various concrete data fields can be defined as:

    class UserCustomDataField(CustomDataField):
        pass

    class UserCustomDataValue(CustomDataValue):
        custom_field = models.ForeignKey(UserCustomDataField)
        user = models.ForeignKey(User, related_name=&#39;custom_data&#39;)

        class Meta:
            unique_together=((&#39;user&#39;,&#39;custom_field&#39;),)

This leads to the following use:

    custom_field = UserCustomDataField.objects.create(name=&#39;zodiac&#39;, site=my_site) #probably created in the admin
    user = User.objects.create(username=&#39;foo&#39;)
    user_sign = UserCustomDataValue(custom_field=custom_field, user=user, data=&#39;Libra&#39;)
    user.custom_data.add(user_sign) #actually, what does this even do?


But this feels very clunky, particularly with the need to manually create the related data and associate it with the concrete model.  Is there a better approach?  

Options that have been pre-emptively discarded:

 - Custom SQL to modify tables on-the-fly.  Partly because this won&#39;t scale and partly because it&#39;s too much of a hack.
 - Schema-less solutions like NoSQL.  I have nothing against them, but they&#39;re still not a good fit.  Ultimately this data **is** typed, and the possibility exists of using a third-party reporting application.
 - JSONField, as listed above, as it&#39;s not going to work well with queries.

Django dynamic model fields

When using setuptools, I can not get the installer to pull in any [`package_data`][1] files. Everything I&#39;ve read says that the following is the correct way to do it. Can someone please advise?

    setup(
       name=&#39;myapp&#39;,
       packages=find_packages(),
       package_data={
          &#39;myapp&#39;: [&#39;data/*.txt&#39;],
       },
       include_package_data=True,
       zip_safe=False,
       install_requires=[&#39;distribute&#39;],
    )

where ``myapp/data/`` is the location of the data files.


  [1]: https://pythonhosted.org/setuptools/setuptools.html#including-data-files

How to include package data with setuptools/distutils?

I configured `git` like this:

    git config --global diff.tool meld

When I run: 

    git difftool

I get the following message:

    Viewing: &#39;hello.txt&#39;
    Hit return to launch &#39;meld&#39;: 

Then, if I press &lt;kbd&gt;Enter&lt;/kbd&gt;, `meld` will launch.

How can I disable this message, so that `meld` will be launched straight away after typing `git difftool`?





Why does &quot;git difftool&quot; not open the tool directly?

I configured <code>git</code> like this:
<pre><code class="hljs language-lua">git config --global diff.tool meld
</code></pre>
When I run:
<pre><code class="hljs">git difftool
</code></pre>
I get the following message:
<pre><code class="hljs language-vbnet">Viewing: 'hello.txt'
Hit return to launch 'meld': 
</code></pre>
Then, if I press <kbd>Enter</kbd>, <code>meld</code> will launch.
How can I disable this message, so that <code>meld</code> will be launched straight away after typing <code>git difftool</code>?

After I pulled from remote branch, I got conflict, when I open the file it looks something like below:

    &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:file.txt
    Hello world
    =======
    Goodbye
    &gt;&gt;&gt;&gt;&gt;&gt;&gt; 77976da35a11db4580b80ae27e8d65caf5208086:file.txt

I need some explanations of the markers, which portion of code is pulled from remote and which is from local?

What does the code `77976da35a11db4580b80ae27e8d65caf5208086` stand for?

Git conflict markers

I&#39;ve added a submodule to my project in `project_dir/vendor/submodule_one` now each time I run `git status` I get `modified: vendor/submodule_one (new commits)`.

My question is whats the best way to deal with this? Do I add the `vendor/submodule_one`-folder to my `.gitignore` as my main project shouldn&#39;t need to know about the specifics of my submodule?

Or when I&#39;m changing and commiting changes to my submodule do I need to make commits in my main project also?

Just getting started with submodules and couldn&#39;t seem to find much info beyond setting them up.

Do you ignore a git submodule in your .gitignore or commit it to your repo?

I created a GitHub account, and I want to give someone write access so he can push just like me, there is a way to add a collaborator with a free plan? If not, what can I do? (besides buying a paid account, which I&#39;ll do in the future)



Adding a collaborator to my free GitHub account?

This question is similar to https://stackoverflow.com/questions/4545370/how-to-list-all-tags-pointing-to-a-specific-commit-in-git, but with one difference: I wish to search for all tags that contain a specific commit within the tree of each tag, not specifically the files marked in the tag itself (in this case, only the Makefile change has been tagged).

How to list all tags that contain a commit?

How do I set Git to automatically push to a remote
repository (including automatically providing my passphrase) after each commit to the local repository?




How can I automatically push after committing in Git?

I&#39;m using **msysgit 1.7.7.1** on Windows. I get an error when using `git diff`. What is causing this? Is there no diff tool included in msysgit? What should I do?

&gt; WARNING: terminal is not fully functional

Why does git diff on Windows warn that the &quot;terminal is not fully functional&quot;?

Is there a Java utility library that is analogous to the Unix program diff, but for Objects?  I&#39;m looking for something that can compare two objects of the same type and generate a data structure that represents the differences between them (and can recursively compare differences in instance variables).  I&#39;m **not** looking for a Java implementation of a text diff.  I&#39;m also **not** looking for help with  how to use reflection to do this.

The application I&#39;m maintaining has a fragile implementation of this functionality that had some poor design choices and that needs to be rewritten, but it would be even better if we could use something off the shelf.

Here&#39;s an example of the kind of thing I&#39;m looking for:

    SomeClass a = new SomeClass();
    SomeClass b = new SomeClass();

    a.setProp1(&quot;A&quot;);
    a.setProp2(&quot;X&quot;);

    b.setProp1(&quot;B&quot;);
    b.setProp2(&quot;X&quot;);

    DiffDataStructure diff = OffTheShelfUtility.diff(a, b);  // magical recursive comparison happens here

After comparison, the utility would tell me that &quot;prop1&quot; is different between the two objects and &quot;prop2&quot; is the same.  I think it&#39;s most natural for DiffDataStructure to be a tree, but I&#39;m not going to be picky if the code is reliable.


Is there a Java library that can &quot;diff&quot; two Objects?

Assuming I have a text file

    alex
    bob
    matrix
    will be removed
    git repo

and I have updated it to be

    alex
    new line here
    another new line
    bob
    matrix
    git

Here, I have added lines number (2,3) and updated line number (6)

How can I get these line numbers info using git diff or any other git command?


Using git diff, how can I get added and modified lines numbers?

When using git, is there a way to show commits made to a branch, while ignoring all commits that were brought in by merging?  

I&#39;m trying to review the code changes made on a branch while ignoring the ones we made on other branches that were merged in.  I know it&#39;s damn near impossible to show a diff in that fashion, but I&#39;d like to be able to find out which commits I need to review.

Showing commits made directly to a branch, ignoring merges in Git

When I use `svn diff` or `git diff` it shows lines like:

    @@ -1,5 +1,9 @@

What do they mean?

What does the “@@…@@” meta line with at signs in svn diff or git diff mean?

I&#39;m trying to integrate WinMerge with Git as I&#39;ve seen others done before on Windows 7 Ultimate.

I&#39;ve followed the following steps, but an error continues to show up when I do a git mergetool which defaults to vimdiff.

Created a file called winmerge.sh in the root directory of git: C/Program Files (x86)/Git/ with: WinMergeU is the correct location.
    

    #!/bin/sh
    echo Launching WinMergeU.exe: $1 $2
    &quot;C:/Program Files (x86)/WinMerge/WinMergeU.exe&quot; 
    git /e /u /dl &quot;Base&quot; /dr &quot;Mine&quot; &quot;$1&quot; &quot;$2&quot;

and used the following commands.

    git config --global diff.tool winmerge
    git config --global difftool.winmerge.cmd &quot;winmerge.sh \&quot;$LOCAL\&quot; \&quot;$REMOTE\&quot;&quot;
    git config --global difftool.prompt false

The error shows up as:

    git config option merge.tool set to unknown tool: winmerge


Content Type	Original Author	Original Content on Stackoverflow
Question	Misha Moroshko	View Question on Stackoverflow
Solution 1 - Git	ZJR	View Answer on Stackoverflow
Solution 2 - Git	Bill Door	View Answer on Stackoverflow

Why does "git difftool" not open the tool directly?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

How to include package data with setuptools/distutils?

Django dynamic model fields

Attributions