    git diff --color-words --no-index old.txt new.txt

According to a comment from Jefromi you can just use

    git diff --color-words file1 file2

outside of git repositories too.

**Git version 1.9.1:**

`git diff --word-diff=color fileA fileB`

you can say `git diff --color=always --color-words`, which will give you the color escape codes in the output. you are going to have some shell to interpret the color codes though …

If I&#39;m inside a git repository (git v2.3.3) :

- `git diff --color-words` doesn&#39;t work (no output)
- `git diff --no-index` doesn&#39;t accept `--color-words` nor `--color` arguments

Using wdiff is possible, configured to use colors, rather than underlined :

    wdiff -n \
      -w $&#39;\033[30;31m&#39; -x $&#39;\033[0m&#39; \
      -y $&#39;\033[30;32m&#39; -z $&#39;\033[0m&#39; \
      … | less -R

Source : [https://www.gnu.org/software/wdiff/manual/html_node/wdiff-Examples.html][1] (modified to use foreground colors rather than background colors)

Hope it helps.

  [1]: https://www.gnu.org/software/wdiff/manual/html_node/wdiff-Examples.html

I need to create a string of hex digits from a list of random integers (0-255). Each hex digit should be represented by two characters: 5 - &quot;05&quot;, 16 - &quot;10&quot;, etc.
 
Example:

&gt;     Input: [0,1,2,3,127,200,255], 
&gt;     Output: 000102037fc8ff

I&#39;ve managed to come up with:

    #!/usr/bin/env python
    
    def format_me(nums):
        result = &quot;&quot;
        for i in nums:
            if i &lt;= 9:
                result += &quot;0%x&quot; % i
            else:
                result += &quot;%x&quot; % i
        return result
    
    print format_me([0,1,2,3,127,200,255])

However, this looks a bit awkward. Is there a simpler way?

Format ints into string of hex

Looking for an open-source Thesaurus dataset which contains as many English root words and synonyms as possible. Any solutions and associated links to data would be appreciated.

Looking for Thesaurus Data

How can I get output like in  `git diff --color-words`, but outside Git?

Closest thing is `wdiff  -t`, but it underlines/inverts things instead of using green/red colours and does not allow specifying my whitespace regex.

How can I use `git diff --color-words` outside a Git repository?

<p>How can I get output like in  <code>git diff --color-words</code>, but outside Git?</p>
<p>Closest thing is <code>wdiff  -t</code>, but it underlines/inverts things instead of using green/red colours and does not allow specifying my whitespace regex.</p>


My friend&#39;s local `master` branch is apparently a disaster (through accidental `merge`s and `commit`s, I guess). However, his dev branches are fine but contain changes he&#39;s not ready to push to remote.

What&#39;s the best way of overriding his local `master` branch with the remote `master` branch and get a fresh copy (without overriding his other branches)?

How to get a fresh copy of a branch from the remote repository?

Currently for switching to another git commit (on the same branch...actually, on the master branch!), I&#39;m executing the command

    git checkout ea3d5ed039edd6d4a07cc41bd09eb58edd1f2b3a

Now, every time I do this git tells me that I&#39;m now with a detached head. How do I go to an older commit and still maintain the head on the same branch?


Checking out an old commit and maintaining the head on the master branch?

Used _`git clone [url]`_ to clone an open source project but it cloned to the 

**`C:\Documents and Setings\$USER\project`**

What I wanted to do is clone the project to **`C:\project`**. I don&#39;t want to have duplicate project clones on my local machine.

How do I go about moving it to that location or deleting the existing repository(hopefully that&#39;s a correct term) and cloning it again?

I assume after deleting I should use something like the following to clone it to the desired location?

_`$ git clone [url] C:\project`_

How to delete or change directory of a cloned git repository on a local computer

I feel like this question has been asked many times, but the solution is typically &quot;I deleted the directory and re-did my work with a fresh checkout.&quot; I did a commit and push but realized that I referred to the wrong ticket number in the commit message. So I looked on SO for a quick [solution][1] and ended up typing the following into the terminal:

    $ git reset --soft HEAD^
    $ git commit -m &quot;... correct message ...&quot;


The only problem is I am getting the following error message:

    To prevent you from losing history, non-fast-forward updates were rejected
    Merge the remote changes before pushing again.  See the &#39;Note about
    fast-forwards&#39; section of &#39;git push --help&#39; for details.

I am using the git-flow model and am working on the develop branch. How can I merge things back in to make git happy again?

  [1]: https://stackoverflow.com/questions/179123/how-do-i-edit-an-incorrect-commit-message-in-git

Git non-fast-forward rejected

This gives a good explanation of squashing multiple commits:

http://git-scm.com/book/en/Git-Branching-Rebasing

but it does not work for commits that have already been pushed. How do I squash the most recent few commits both in my local and remote repos? 

When I do `git rebase -i origin/master~4 master`, keep the first one as `pick`, set the other three as `squash`, and then exit (via c-x c-c in emacs), I get:

    $ git rebase -i origin/master~4 master
    # Not currently on any branch.
    nothing to commit (working directory clean)
    
    Could not apply 2f40e2c... Revert &quot;issue 4427: bpf device permission change option added&quot;
    $ git rebase -i origin/master~4 master
    Interactive rebase already started

where 2f40 is the `pick` commit. And now none of the 4 commits appear in `git log`. I expected my editor to be restarted so that I could enter a commit message. What am I doing wrong?

How to squash commits in git after they have been pushed?

How can I print color in console? I want to show data in colors when the processor sends data and in different colors when it receives data.

How to print color in console using System.out.println?

I need to generate random color names e.g. &quot;Red&quot;, &quot;White&quot; etc. How can I do it? I am able to generate random color like this: 

    Random randonGen = new Random();
    Color randomColor = Color.FromArgb(randonGen.Next(255), randonGen.Next(255), 
    randonGen.Next(255));

but I need the names and not all colors generated like this have a known name.

Thanks

How to generate random color names in C#

Hi how to set `R G B` values in `System.Drawing.Color.G` ?

which is like `System.Drawing.Color.G=255;` is not allowed because its read only 


    Property or indexer &#39;System.Drawing.Color.G&#39; cannot be assigned toit is read only

i just need to create a `Color` Object by assigning custom `R G B` values 



Set System.Drawing.Color values

Is it possible to set a transparency or alpha level on SVG fill colours?

I&#39;ve tried adding two values to the fill tag (changing it from `fill=&quot;#044B94&quot;` to `fill=&quot;#044B9466&quot;`), but this doesn&#39;t work.

SVG fill color transparency / alpha?

I&#39;m working with data that has the data has 3 plotting parameters: x,y,c. How do you create a custom color value for a scatter plot? 

Extending this [example](https://stackoverflow.com/questions/2925806/fixing-color-in-scatter-plots-in-matplotlib) I&#39;m trying to do:

    import matplotlib
    import matplotlib.pyplot as plt
    cm = matplotlib.cm.get_cmap(&#39;RdYlBu&#39;)
    colors=[cm(1.*i/20) for i in range(20)]
    xy = range(20)
    plt.subplot(111)
    colorlist=[colors[x/2] for x in xy] #actually some other non-linear relationship
    plt.scatter(xy, xy, c=colorlist, s=35, vmin=0, vmax=20)
    plt.colorbar()
    plt.show()

but the result is `TypeError: You must first set_array for mappable`

matplotlib colorbar for scatter

I moved a file using `git mv`. Now I would like to do a diff on the new file to compare it with the old file (with the old, now non-existent name). 

How do I do this?

How to do a git diff on moved/renamed file?

So I want to [compare this folder][1] `http://cloudobserver.googlecode.com/svn/branches/v0.4/Boost.Extension.Tutorial/libs/boost/extension/` with [this][2] `http://svn.boost.org/svn/boost/sandbox/boost/extension/`. I want to get a diff file as a result. These folders are under svn control but I&#39;d prefer git styled diff file (like one [shown here][3]) I tried `git diff` but it seems not to work that way for web folders. So how to do the same thing with one command on Linux?

***Update:***
So we had [a great answer][4]. But it works strangely - it seems to me it shows that all files (same files) have all theire contents replaced with very same contents (while I know for sure that there were only like 3-4 code lines changed at all)...

***Update 2:***
To achieve what I really needed (dif file with only really changed lines, with git styling, on Linux) do:

    $ svn export http://cloudobserver.googlecode.com/svn/branches/v0.4/Boost.Extension.Tutorial/libs/boost/extension/ repos2 --native-eol CRLF
    $ svn export http://svn.boost.org/svn/boost/sandbox/boost/extension/ repos --native-eol CRLF
    $ git diff repos repos2 &gt; fileWithReadableDiff.diff

  [1]: http://cloudobserver.googlecode.com/svn/branches/v0.4/Boost.Extension.Tutorial/libs/boost/extension/
  [2]: http://svn.boost.org/svn/boost/sandbox/boost/extension/
  [3]: https://stackoverflow.com/questions/5836948/boost-extension-simple-inheritance-sample-why-we-see-no-animals-on-linux/5838527#5838527
  [4]: https://stackoverflow.com/questions/5874090/linux-how-to-get-diff-between-all-files-inside-2-folders-that-are-on-the-web/5874256#5874256


How to get diff between all files inside 2 folders that are on the web?

This is more of a CS question, but an interesting one :

Let&#39;s say we have 2 tree structures with more or less the same nodes reorganized. How would you find

 1. *any* 
 2. in some sense *minimal*

sequence of operations 

 - `MOVE(A, B)` - moves node A under node B (with the whole subtree)
 - `INSERT(N, B)` - inserts a **new** node N under node B 
 - `DELETE (A)` - deletes the node A (with the whole subtree)

that transforms one tree to the other.

There might obviously be cases where such transformation is not possible, trivial being root A with child B to root B with child A etc.). In such cases, the algorithm would simply deliver an result &quot;*not possible*&quot;.

Even more spectacular version is a generalization for networks, i.e. when we assume that a node can occur multiple times in the tree (effectively having multiple &quot;parents&quot;), while cycles are forbidden.

Disclaimer : This is **not** a homework, actually it comes from a real business problem and I found it quite interesting wondering if somebody might know a solution.

Calculate minimal operations to make two tree structures identical

How do I view previous diff commits using Git?

I have a file that I&#39;ve made several commits on, but I want to view previous versions of the file AND its diff&#39;s at different stages. Seeing where I made mistakes and how I fixed them is really helping my code. By the way, I&#39;m using Tower as a GUI on top of Git.


How do I view previous diff commits using Git?

How can I download the changes contained in a Github pull request as a unified diff?

Download Github pull request as unified diff

What&#39;s the best way to slice the last word from a block of text? 

I can think of 

 1. Split it to a list (by spaces) and removing the last item, then reconcatenating the list.
 2. Use a regular expression to replace the last word.

I&#39;m currently taking approach #1, but I don&#39;t know how to concatenate the list...

    content = content[position-1:position+249] # Content
    words = string.split(content, &#39; &#39;)
    words = words[len[words] -1] # Cut of the last word

Any code examples are much appreciated.


Python: Cut off the last word of a sentence?

I&#39;ve done some research.
A byte is 8 bits and a word is the smallest unit that can be addressed on memory. The exact length of a word varies. What I don&#39;t understand is what&#39;s the point of having a byte? Why not say 8 bits?

I asked a prof this question and he said most machines these days are byte-addressable, but what would that make a word?

What&#39;s the difference between a word and byte?

I want to match a regular expression on a whole word.

In the following example I am trying to match `s` or `season` but what I have matches `s`, `e`, `a`, `o` and `n`.  

    [s|season]

How do I make a regular expression to match a whole word?


Regular expression to match a word or its prefix

I have tried to get a grasp of what **&quot;word&quot;** means and I have looked in the wiki and the definition is vague. So my question is what is **&quot;word size&quot;**? Is it the length of the data bus, address bus?

What does it mean by word size in computer?

I am using Python 3.3

I need to create two lists, one for the unique words and the other for the frequencies of the word.

I have to sort the unique word list based on the frequencies list so that the word with the highest frequency is first in the list. 

I have the design in text but am uncertain how to implement it in Python. 

The methods I have found so far use either `Counter` or dictionaries which we have not learned. I have already created the list from the file containing all the words but do not know how to find the frequency of each word in the list. I know I will need a loop to do this but cannot figure it out.

Here&#39;s the basic design:         
                     
     original list = [&quot;the&quot;, &quot;car&quot;,....]
     newlst = []
     frequency = []
     for word in the original list
           if word not in newlst:
               newlst.append(word)
               set frequency = 1
           else
               increase the frequency
     sort newlst based on frequency list 



Content Type	Original Author	Original Content on Stackoverflow
Question	Vi.	View Question on Stackoverflow
Solution 1 - Git	Vi.	View Answer on Stackoverflow
Solution 2 - Git	Thomas	View Answer on Stackoverflow
Solution 3 - Git	JellicleCat	View Answer on Stackoverflow
Solution 4 - Git	knittl	View Answer on Stackoverflow
Solution 5 - Git	Pierre-Olivier Vares	View Answer on Stackoverflow

How can I use `git diff --color-words` outside a Git repository?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Solution 5 - Git

Looking for Thesaurus Data

Format ints into string of hex

Attributions