`git`&#39;s diff is more functional than the standard unix `diff`.  I often want to do this and since this question ranks highly on google, I want this answer to show up.

This question: [How to use `git diff --color-words` outside a Git repository?][1]

Shows how to use git to diff files where at least one of them is not in the repository by using `--no-index`:

    git diff --no-index file1.txt file2.txt

It doesn&#39;t matter which one is tracked by git and which is not - one or both can be untracked, eg:

    $ date &gt; x
    $ sleep 2
    $ date &gt; y
    $ git diff --color-words --no-index x y
    diff --git a/x b/y
    index 6b10c7c..70f036c 100644
    --- a/x
    +++ a/y
    @@ -1 + 1 @@
    Wed Jun 10 10:57:45|10:57:47 EDT 2013

The color can&#39;t be shown here so I separated the changes with a pipe in the example.


  [1]: https://stackoverflow.com/questions/5637311/how-to-use-git-diff-color-words-outside-a-git-repository

`diff -u` 

will give similar unified context output to git&#39;s diff.

Just use the diff command:  

    diff file1.ext file2.ext

I&#39;m new to HTML5 as begun to work with HTML5&#39;s new form input fields. When I&#39;m working with form input fields, especially `&lt;input type=&quot;text&quot; /&gt;` and `&lt;input type=&quot;search&quot; /&gt;` IMO there wasn&#39;t any difference in all major browser including Safari, Chrome, Firefox and Opera. And the search field also behaves like a regular text field.

So, what is the difference between `input type=&quot;text&quot;` and `input type=&quot;search&quot;` in HTML5?

What is the real purpose of `&lt;input type=&quot;search&quot; /&gt;`?


input type=&quot;text&quot; vs input type=&quot;search&quot; in HTML5

When you&#39;re editing a Microsoft Office VBA macro or function, you will often move your cursor from a line that you haven&#39;t finished.  For example, to go copy something you want to paste into that line.  But, if that partial line isn&#39;t syntactically valid, the VBA editor interrupts your work by popping up a &quot;Compile error&quot; message that has to be dismissed.

Is there any way to disable the message box?  I find it irritating...

(This happens with Excel Visual Basic for Applications, Outlook VBA, Word VBA, etc.)

When editing Microsoft Office VBA, how can I disable the popup &quot;Compile error&quot; messages?

I&#39;d like to compare two css files which are not in any git repository. Is there such a functionality in git?

How to compare two files not in repo using git

<p>I'd like to compare two css files which are not in any git repository. Is there such a functionality in git?</p>


I have started using `git rebase` recently and am not 100% certain I&#39;m doing it right. For the sake of the question, there are two branches in origin, `master` and `next`, which was branched from `master`.

Since last sync between the two, `master` had 2 commits and `next` 6:

    $ git log --oneline origin/next..origin/master
    59b5552 master commit #2
    485a811 master commit #1

    $ git log --oneline origin/master..origin/next
    4ebf401 next commit #6
    e9b6586 next commit #5
    197ada0 next commit #4
    4a2c3c6 next commit #3
    040a055 next commit #2
    84537bf next commit #1

When I checkout `next` and execute `git rebase -i origin/master`, I get the following:

    $ git status
    # On branch next
    # Your branch and &#39;origin/next&#39; have diverged,
    # and have 8 and 6 different commits each, respectively.

And finally after doing `git pull --rebase`, the two commits from `master` are in `next`:

    $ git log --oneline origin/next..next 
    8741d09 master commit #2
    485a811 master commit #1

Questions:

 1. Is this correct approach?
 2. Why are there `8 and 6` different commits until `pull --rebase` is run?
 3. Is it possible to simplify the flow?

Much obliged :)

git rebase basics

I keep important settings like the hostnames and ports of development and production servers in my version control system. But I know that it&#39;s _bad practice_ to keep *secrets* (like private keys and database passwords) in a VCS repository.

But passwords--like any other setting--seem like they should be versioned. So what *is* the proper way to keep passwords version controlled?

I imagine it would involve keeping the *secrets* in their own &quot;secrets settings&quot; file and having *that* file encrypted and version controlled. But what technologies? And how to do this properly? Is there a better way entirely to go about it?

----------
I ask the question generally, but in my specific instance I would like to store secret keys and passwords for a *Django/Python* site using *git* and *github*.

Also, an *ideal* solution would do something magical when I push/pull with git--e.g., if the encrypted passwords file changes a script is run which asks for a password and decrypts it into place.

&lt;hr&gt;
EDIT: For clarity, I *am* asking about where to store *production* secrets.


How can I save my secret keys and password securely in my version control system?

I&#39;m trying to commit some changes as a different user, but i do not have a valid email address, following command is not working for me:

    git commit --author=&quot;john doe&quot; -m &quot;some fix&quot;
    fatal: No existing author found with &#39;john doe&#39;

I have the same problem when trying to commit with only an email address

    git commit --author=&quot;john@doe.com&quot; -m &quot;some fix&quot;
    fatal: No existing author found with &#39;john@doe.com&#39;

On the GIT man pages for the commit command it says i can use the 

    standard A U Thor &lt;author@example.com&gt; format

For the --author option.

Where is this format defined ?
what does A and U stand for ? how do i commit for a different user with only a username or only an email?

GIT commit as different user without email / or only email

I am relatively new to git. Our organization uses a [Fork &amp; Pull Model][1] for managing changes to the master branch. Each developer forks the master and branches from their fork when adding new features. I keep an eye on commits that other developers are making in their own branches, and would sometimes like to merge these changes into my own branch. What steps do I take to accomplish this?


  [1]: https://help.github.com/articles/using-pull-requests/

How do I merge another developer&#39;s branch into mine?

I stupidly pushed a commit to GitHub with a very messed up commit name. How do I change this?

Does `git commit --amend` still work for already pushed commit?

How do you rename a Git commit pushed to GitHub?

What is the easiest way (using a graphical tool or command line on Ubuntu Linux) to know if two binary files are the same or not (except for the time stamps)? I do not need to actually extract the difference. I just need to know whether they are the same or not.

How to compare binary files to check if they are the same?

    var _My_ResetSet_Array = _DB
		.tbl_MyTable
		.Where(x =&gt; x.Active == true
			&amp;&amp; x.DateTimeValueColumn &lt;= DateTime.Now)
		.Select(x =&gt; x);

Upper query is working correct.&lt;br&gt; 
But I want to check only date value only.&lt;br&gt;
But upper query check date + time value.

In traditional mssql, I could write query like below.

    SELECT * FROM dbo.tbl_MyTable
    WHERE 
    CAST(CONVERT(CHAR(10), DateTimeValueColumn, 102) AS DATE) &lt;= 
                CAST(CONVERT(CHAR(10),GETDATE(),102) AS DATE)
    AND
    Active = 1

So could anyone give me suggestion how could I check only date value in Linq.

Linq where clause compare only date value without time value

I saw the new comparison tool in Visual&amp;nbsp;Studio&amp;nbsp;2012 for comparing two files or two versions of a file. I like it. But when I tried to find it I couldn&#39;t it, because I don&#39;t use [TFS][1].

Is there a way how I can just compare two files with the built-in feature in Visual&amp;nbsp;Studio (but without TFS)?

  [1]: https://en.wikipedia.org/wiki/Team_Foundation_Server




Compare two files in Visual Studio

Say I have large datasets in R and I just want to know whether two of them they are the same. I use this often when I&#39;m experimenting different algorithms to achieve the same result. For example, say we have the following datasets:

    df1 &lt;- data.frame(num = 1:5, let = letters[1:5])
    df2 &lt;- df1
    df3 &lt;- data.frame(num = c(1:5, NA), let = letters[1:6])
    df4 &lt;- df3

So this is what I do to compare them:

    table(x == y, useNA = &#39;ifany&#39;)

Which works great when the datasets have no NAs:

    &gt; table(df1 == df2, useNA = &#39;ifany&#39;)
    TRUE 
      10 

But not so much when they have NAs:

    &gt; table(df3 == df4, useNA = &#39;ifany&#39;)
    TRUE &lt;NA&gt; 
      11    1 

In the example, it&#39;s easy to dismiss the `NA` as not a problem since we know that both dataframes *are* equal. The problem is that `NA == &lt;anything&gt;` yields `NA`, so whenever one of the datasets has an `NA`, it doesn&#39;t matter what the other one has on that same position, the result is always going to be `NA`.

So using `table()` to compare datasets doesn&#39;t seem ideal to me. **How can I better check if two data frames are identical?**

P.S.: Note this is not a duplicate of https://stackoverflow.com/questions/12567524/r-comparing-several-datasets, https://stackoverflow.com/questions/7459138/comparing-2-datasets-in-r or https://stackoverflow.com/questions/8872333/compare-datasets-in-r

How to check if two data frames are equal

My whole script is currently this:

    #!/bin/sh   
    clear;   
    blanko=&quot;&quot;;   
    # Dummy-Variablen
    variable=Testvariable;   
    if [[$variable == $blanko]];
    then   
      echo &quot;Nichts da!&quot;   
    else   
      echo $variable   
    fi
    
and if I enter 

    TestSelect.sh

I get

    /usr/bin/TestSelect.sh: line 6: [[Testvariable: command not found   
    Testvariable

How can I fix this?

Getting &quot;command not found&quot; error while comparing two strings in Bash

I&#39;m using Subversion via the Linux command line interface.

I want to see the difference between revision 11390 and 8979 of a specific file called `fSupplierModel.php` in my terminal. How can I do that?

How do I output the difference between two specific revisions in Subversion?

As in the title, I want to have a diff file for a certain folder between the master branch and a branch I have created.

Differences for a certain folder between git branches

I have a .diff file created by a coworker, and would like to apply the changes listed in that diff file to my local branch of the exact same repository.  I do not have access to that worker&#39;s pc or branch that was used to generate this diff file.

Obviously I could go line by line and retype everything, but i&#39;d rather not subject the system to human error. What&#39;s the easiest way to do this?

How do you take a git diff file, and apply it to a local branch that is a copy of the same repository?

Is there a way to show the git-diff filtered by a given pattern.

Something like 

    git grepdiff pattern

    changed file
    +++ some sentence with pattern
    changed file 2
    --- some other pattern

Unfortunately the simplest solution is not good enough

    git diff | grep pattern 
    
    +++ some sentence with pattern
    --- some other pattern
    # not an option as doesn&#39;t put the filename close to the match

I came with a workaround using awk

    git diff | awk &quot;/\+\+\+/{f = \$2}; /PATTERN/ {print f \$0} &quot;

But would love to find out that there is a command for this.

Content Type	Original Author	Original Content on Stackoverflow
Question	Cedric Reichenbach	View Question on Stackoverflow
Solution 1 - Git	Kyle Burton	View Answer on Stackoverflow
Solution 2 - Git	james	View Answer on Stackoverflow
Solution 3 - Git	edwardmp	View Answer on Stackoverflow

How to compare two files not in repo using git

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

When editing Microsoft Office VBA, how can I disable the popup "Compile error" messages?

input type="text" vs input type="search" in HTML5

Attributions