Since [Git 1.8.2](https://git-htmldocs.googlecode.com/git/RelNotes/1.8.2.txt &quot;released 2013-03-13&quot;), Git will use `diff.algorithm`:

    git config --global diff.algorithm patience

It took a few iterations:

&gt; [[PATCH v3 0/3] Rework git-diff algorithm selection](http://comments.gmane.org/gmane.comp.version-control.git/213736)
&gt;
&gt; [[PATCH v2 0/3] Rework git-diff algorithm selection](http://comments.gmane.org/gmane.comp.version-control.git/213526)
&gt;
&gt; [[PATCH 0/3] Rework git-diff algorithm selection](http://comments.gmane.org/gmane.comp.version-control.git/213294)
&gt;
&gt; [[PATCH] diff: Introduce diff.algorithm variable](http://comments.gmane.org/gmane.comp.version-control.git/192719).
&gt;
&gt; [[PATCH] config: Introduce --patience config variable](http://comments.gmane.org/gmane.comp.version-control.git/192331)

In lieu of a config-based answer, you could set an alias in your `.gitconfig` like so:

`[alias]`  
`    dp = diff --patience`  


Which will allow you to do `git dp [optional refspec]`


I want to retrieve records for last 30 minutes in a table. How to do that? Below is my query..

    select * from
    [Janus999DB].[dbo].[tblCustomerPlay]
    where DatePlayed &lt; CURRENT_TIMESTAMP
    and DatePlayed &gt;
    (CURRENT_TIMESTAMP-30)

How to retrieve records for last 30 minutes in MS SQL?

I&#39;m experiencing a problem with MySQL&#39;s &quot;GROUP_CONCAT&quot; function. I will illustrate my problem using a simple help desk database:

    CREATE TABLE Tickets (
     id INTEGER NOT NULL PRIMARY KEY,
     requester_name VARCHAR(255) NOT NULL,
     description TEXT NOT NULL);

    CREATE TABLE Solutions (
     id INTEGER NOT NULL PRIMARY KEY,
     ticket_id INTEGER NOT NULL,
     technician_name VARCHAR(255) NOT NULL,
     solution TEXT NOT NULL,
     FOREIGN KEY (ticket_id) REFERENCES Tickets.id);

    INSERT INTO Tickets VALUES(1, &#39;John Doe&#39;, &#39;My computer is not booting.&#39;);
    INSERT INTO Tickets VALUES(2, &#39;Jane Doe&#39;, &#39;My browser keeps crashing.&#39;);
    INSERT INTO Solutions VALUES(1, 1, &#39;Technician A&#39;, &#39;I tried to solve this but was unable to. I will pass this on to Technician B since he is more experienced than I am.&#39;);
    INSERT INTO Solutions VALUES(2, 1, &#39;Technician B&#39;, &#39;I reseated the RAM and that fixed the problem.&#39;);
    INSERT INTO Solutions VALUES(3, 2, &#39;Technician A&#39;, &#39;I was unable to figure this out. I will again pass this on to Technician B.&#39;);
    INSERT INTO Solutions VALUES(4, 2, &#39;Technician B&#39;, &#39;I re-installed the browser and that fixed the problem.&#39;);

Notice that this help desk database has two tickets, each with two solution entries. My goal is to use a SELECT statement to create a list of all of the tickets in the database with their corrosponding solution entries. This is the SELECT statement I&#39;m using:

    SELECT Tickets.*, GROUP_CONCAT(Solutions.solution) AS CombinedSolutions
    FROM Tickets
    LEFT JOIN Solutions ON Tickets.id = Solutions.ticket_id
    ORDER BY Tickets.id;

The problem with the above SELECT statement is it&#39;s returning only one row:

    id: 1
    requester_name: John Doe
    description: My computer is not booting.
    CombinedSolutions: I tried to solve this but was unable to. I will pass this on to Technician B since he is more experienced than I am.,I reseated the RAM and that fixed the problem.,I was unable to figure this out. I will again pass this on to Technician B.,I re-installed the browser and that fixed the problem.

Notice that it&#39;s returning ticket 1&#39;s information with both ticket 1&#39;s and ticket 2&#39;s solution entries.

What am I doing wrong? Thanks!

MySQL: GROUP_CONCAT with LEFT JOIN

In .git/config I tried:

    [diff]
        patience = true

But no luck

Do I have to do:
 
    git diff --patience
    git show --patience HEAD
etc., every time?

How to set patience as default git diff algorithm

In .git/config I tried:
<pre><code class="hljs language-ini">[diff]
 patience = true
</code></pre>
But no luck
Do I have to do:
<pre><code class="hljs language-sql">git diff --patience
git show --patience HEAD
</code></pre>
etc., every time?

I have a code base which I want to push to GitHub as open source. In this Git-controlled source tree, I have certain configuration files which contain passwords. I made sure not to track this file and I also added it to the `.gitignore` file. However, I want to be absolutely positive that no sensitive information is going to be pushed, perhaps if something slipped in-between commits or something. I doubt I was careless enough to do this, but I want to be _positive_.

Is there a way to &quot;grep&quot; all of Git? I know that sounds weird, but by &quot;all&quot; I mean every version of every file that ever existed. I guess if there is a command that dumps the diff file for every commit, that might work?





Search all of Git history for a string

I have two branches: **master** and **dev**

I want to create a &quot;feature branch&quot; from the **dev** branch.

Currently on the branch dev, I do:

    $ git checkout -b myfeature dev

... (some work)

    $ git commit -am &quot;blablabla&quot;
    $ git push origin myfeature

But, after visualizing my branches, I got:

    --**master**
    ------0-----0-----0-----0-----0
    ------------------------**dev**----**myfeature**

I mean that the branch seems ff merged, and I don&#39;t understand why...

What I&#39;m doing wrong?

Can you explain me please how you branch off from another branch and push back to the remote repository for the feature branch?

All that in a branching model like [the one described here][1].

  [1]: http://nvie.com/posts/a-successful-git-branching-model/



Create a branch in Git from another branch

I have a bunch of files in a changeset, but I want to specifically ignore a single modified file. Looks like this after `git status`:


    # modified:   main/dontcheckmein.txt
    # deleted:    main/plzcheckmein.c
    # deleted:    main/plzcheckmein2.c
    ...

Is there a way I can do `git add` but just ignore the one text file I don&#39;t want to touch? Something like:

    git add -u -except main/dontcheckmein.txt


Add all files to a commit except a single file?

I am trying to customize the format for `git log`. I want all commits to be shown in one line. Each line should only show the first line of the commit message.   
I [found out][1] that `git log --pretty=short` should do the trick but on my computer it shows the full log as `git log` does (besides the time stamp).

Further, I tried to use the [placeholders as defined in the man page][2]. Though, I could not find a command to shorten the log message. I tried this line `git log --pretty=format:&#39;%h : %s&#39;` which shows the shorted hash `%h`and the full message `%s` in one line.

I am using `git version 1.7.3.1.msysgit.0` on Vista.


----------

Maybe it has something to do with the way I write my commit messages. Here is an example:

    Added some functionality.
    + Added print function in Foo class.
    + Added conversion from foo to baz.

So, with the example given I only want to be output `Added some functionality.` prepended by the shortend hash.

  [1]: http://book.git-scm.com/3_reviewing_history_-_git_log.html
  [2]: http://git-scm.com/docs/git-log

How to output git log with the first line only?

I want to use something similar to:

    git checkout -- &lt;path&gt;/&lt;file&gt;

but I want to checkout the file to some folder I choose, rather than the overwriting the local `&lt;path&gt;/&lt;file&gt;`.

Any idea?

GIT: Checkout to a specific folder

For the problem I&#39;m working on, finding distances between two sequences to determine their similarity, sequence order is very important. However, the sequences that I have are not all the same length, so I pad any deficient strings with empty points such that both sequences are the same length in order to satisfy the Hamming distance requirement. Is there any major problem with me doing this, since all I care about are the number of transpositions (not insertions or deletions like Levenshtein does)?

I&#39;ve found that Hamming distance is much, much faster than Levenshtein as a distance metric for sequences of longer length. When should one use Levenshtein distance (or derivatives of Levenshtein distance) instead of the much cheaper Hamming distance? Hamming distance can be considered the upper bound for possible Levenshtein distances between two sequences, so if I am comparing the two sequences for a order-biased similarity metric rather than the absolute minimal number of moves to match the sequences, there isn&#39;t an apparent reason for me to choose Levenshtein over Hamming as a metric, is there?



Hamming Distance vs. Levenshtein Distance

I don&#39;t see a difference between the output of &#39;git format-patch&#39; and &#39;git diff&#39;, is there any? And won&#39;t I be able to use &#39;git diff&#39; to produce a patch and then apply it using git apply?

My problem is that I have changes added to the index, but apparently git format-patch only accepts commits, so if I can use the output of diff, then I can use this command to produce a patch for the changes in the index:

    git diff --cached &gt; index.patch


What is the difference between &#39;git format-patch and &#39;git diff&#39;?

I like the output formatting of `git diff`.  The color and the `+`/`-` representation of changes between lines is easier to read than GNU diff.

I can run `git diff` using `--no-index` flag outside of a git repo and it works fine. However, it appears to be missing the `--exclude` option for excluding files or subdirectories from a recursive `diff`. 

Is there a way to get the best of both worlds? (color options and `+`/`-` format of `git diff` and `--exclude` option of GNU diff).  

I&#39;ve experimented with [`colordiff`](http://colordiff.sourceforge.net/), but I still prefer the output format of `git diff`

How to get diff working like git-diff?

I want to check the real diff between remote branch and local branch. How can I do that?

Issuing the below command partially works, but it shows the diff of the new changes of my local branch too.

    git diff remote/branch


How to check real git diff before merging from remote branch?

If I want find the differences between two directory trees, I usually just execute:

    diff -r dir1/ dir2/

This outputs exactly what the differences are between corresponding files.  I&#39;m interested in just getting a list of corresponding files whose content differs.  I assumed that this would simply be a matter of passing a command line option to `diff`, but I couldn&#39;t find anything on the man page.

Any suggestions?

Content Type	Original Author	Original Content on Stackoverflow
Question	EoghanM	View Question on Stackoverflow
Solution 1 - Git	Tobu	View Answer on Stackoverflow
Solution 2 - Git	urschrei	View Answer on Stackoverflow

How to set patience as default git diff algorithm

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

MySQL: GROUP_CONCAT with LEFT JOIN

How to retrieve records for last 30 minutes in MS SQL?

Attributions