OK, found the answer myself.

Adding `.patch` (or `.diff`) to the commit-URL will give a nice patch:

    https://github.com/foo/bar/commit/${SHA}.patch

Thanks to [Ten Things You Didn&#39;t Know Git And GitHub Could Do](https://owenou.com/ten-things-you-didnt-know-git-and-github-could-do)...

I found I had to add a / at the end, i.e. 

    https://github.com/foo/bar/commit/${SHA}.patch/


According to the [Gensim Word2Vec][1], I can use the word2vec model in gensim package to calculate the similarity between 2 words.

e.g.

    trained_model.similarity(&#39;woman&#39;, &#39;man&#39;) 
    0.73723527

However, the word2vec model fails to predict the sentence similarity. I find out the LSI model with sentence similarity in gensim, but, which doesn&#39;t seem that can be combined with word2vec model. The length of corpus of each sentence I have is not very long (shorter than 10 words).  So, are there any simple ways to achieve the goal?


  [1]: http://radimrehurek.com/gensim/models/word2vec.html

How to calculate the sentence similarity using word2vec model of gensim with python

In my gulp.js file I&#39;m streaming all HTML files from the `examples` folder into the `build` folder. 

To create the gulp task is not difficult:

    var gulp = require(&#39;gulp&#39;);
    
    gulp.task(&#39;examples&#39;, function() {
    	return gulp.src(&#39;./examples/*.html&#39;)
    		.pipe(gulp.dest(&#39;./build&#39;));
    });

But I can&#39;t figure out how retrieve the file names found (and processed) in the task, or I can&#39;t find the right plugin.

Get the current file name in gulp.src()

I would like to get a single commit (let&#39;s call it `${SHA}`) from GitHub via the web-interface.

For example, something like:

    $ git clone http://github.com/foo/bar
    $ cd bar
    $ git format-patch -o .. ${SHA}~1..${SHA}
    $ cd ..
    $ rm -rf bar

...but without having to clone the entire repository (the repo in question is large).

Obviously GitHub can display the diff of a given commit via the web interface, but how I can extract that into a (unified) diff-file (ideally, with the commit-message intact)?

How to download a single commit-diff from GitHub?

I would like to get a single commit (let's call it <code>${SHA}</code>) from GitHub via the web-interface.
For example, something like:
<pre><code class="hljs language-shell">$ git clone http://github.com/foo/bar
$ cd bar
$ git format-patch -o .. ${SHA}~1..${SHA}
$ cd ..
$ rm -rf bar
</code></pre>
...but without having to clone the entire repository (the repo in question is large).
Obviously GitHub can display the diff of a given commit via the web interface, but how I can extract that into a (unified) diff-file (ideally, with the commit-message intact)?

I have an app on Heroku that is running old code.  I&#39;ve made a small change and committed the change.  I then ran

    git push heroku master

It&#39;ll say

    Fetching repository, done.
    Everything up-to-date

But if I go and look at the app, it&#39;s all old code.  I did revert the site back to another version in Heroku about 15 days ago, but pushed updates to it since then and they worked.

Why is heroku not getting the most current files from my github repository?  Is there a way to just reset the app and push the files from github again?  I have production data in the database so I do NOT want to touch it.

Thanks in advance!!

git push heroku master says &quot;Everything up-to-date&quot;, but the app is not current

I am having some problems working with 
`git clone`.The files are downloaded in my local git folder. Running the command

`git checkout -f HEAD` gives me-

Error:
--------

&gt; &#39;The unable to write new index file error caused by the lack of disk space&#39;. 

I&#39;ve manually removed big files from my computer, but still getting the same error.

    Cloning into &#39;ffmpeg&#39;...
    remote: Counting objects: 7890, done.  
    remote: Compressing objects: 100% (4412/4412), done.
    Receiving objects: 100% (7890/7890), 299.75 MiB | 24.19 MiB/s, done.
    remote: Total 7890 (delta 3346), reused 7846 (delta 3317)
    Resolving deltas: 100% (3346/3346), done.
    Checking out files: 100% (7019/7019), done.
    fatal: unable to write new index file
    warning: Clone succeeded, but checkout failed.
    You can inspect what was checked out with &#39;git status&#39;
    and retry the checkout with &#39;git checkout -f HEAD&#39;

GitHub: Clone succeeded, but checkout failed

I have the following problem when I try to pull code using git Bash on Windows:
```
fatal: could not read Username for &#39;https://github.com&#39;: No such file or directory
```

I already tried to implement the accepted solution provided here:

 * https://stackoverflow.com/questions/20871549/error-when-push-commits-with-github-fatal-could-not-read-username

...but the problem persists. After adding/removing origin I still get the same error.

fatal: could not read Username for &#39;https://github.com&#39;: No such file or directory

What is the difference between a Pull request and a Merge request?

In GitHub, it&#39;s a Pull Request while in GitLab, for example, it&#39;s a Merge Request. So, is there a difference between both of these?

Pull request vs Merge request

Can one transfer repositories from GitLab to GitHub if the need be. If so, how exactly can I go about doing the same?

Also, are there any pitfalls in doing so or precautionary measures that I need to keep in mind  before doing so given that I may decide to eventually move them to GitHub (as it has more features at the moment that I might find handy for my project).

Transfer git repositories from GitLab to GitHub - can we, how to and pitfalls (if any)?

Is it possible to configure git diff to respect indentation and syntax?
I am not talking about ignoring indentation and spaces, but rather to use blank lines, indentation levels and possibly brackets, to help matching the old lines to new lines.

E.g. git diff often cuts through functions and their docblock, like this:


     class C {
     
       /**
    +   * Goes to the bar.
    +   */
    +  function bar() {
    +    return &#39;bar&#39;;
    +  }
    +
    +  /**
        * Gets your foo up to date.
        */
       function foo() {

When I would prefer

     class C {
    +
    +  /**
    +   * Goes to the bar.
    +   */
    +  function bar() {
    +    return &#39;bar&#39;;
    +  }
     
       /**
        * Gets your foo up to date.
        */
       function foo() {

In this example it is still quite harmless, but there are examples where functions and their docblock are really ripped apart due to the greedy and naive diff implementation.

Note: I already configured `*.php diff=php` in `~/.gitattributes`.

EDIT: Another example:
Here git diff mixes a property docblock with a method docblock:

       /**
    -   * @var int
    +   * @param string $str
        */



git diff algorithm that does not rip functions apart? (language-aware diff)

I have two cloned repositories of two very similar open-source projects, which I have been working on in different instances in Sublime Text 2 to arrive at my desired result. Code from both of these projects was used. I have been using Git as version control for my project, but have not included the original projects. Thus, I would like to be able to quickly compare the contents of two files of the original project and compare the differences between them and my project.

I was hoping that Sublime Text 2 would have a &quot;Compare File&quot; feature, but I can&#39;t seem to find anything related to it in the settings or online. A third-party ST2 package to accomplish this task would also work well. **Is such a task possible to do within the ST2 text editor?** 

Comparing the contents of two files in Sublime Text

In  my case, I have two files file1 and file2. Using vimdiff, I want to merge the changes as follows:

1. In first difference, place line from file1 above line from file2. It means difference such as `Listing 2` in file2 and `List 2` should be `List 2` followed by `Listing 2` in the merged file.
2. Reverse case in another change.

Snapshot is shown below.

![enter image description here][1]

How can we achieve this using vimdiff?


  [1]: http://i.stack.imgur.com/tAppj.png

Merge changes using vimdiff

I work on WordPress based project and I want to patch my project at each new release version of WP. For this, I want generate a patch between two commits or tags.

For example, in my repo `/www/WP` I do this:
```bash
$ git patch-format com1..com2 --stdout &gt; &#39;~/patchs/mypatch.patch&#39;

# or

$ git patch-format tag1..tag2 --stdout &gt; &#39;~/patchs/mypatch.patch&#39;
```

`/www/WP` git natif WordPress

`/www/myproject` My git project WordPress based


The `git apply` command line doesn&#39;t work, I think because we are in different repositories.

Can I generate a patch file without a commit, just a differential and apply it to another git repository?

Thank you.

Create patch or diff file from git repository and apply it to another different git repository

 I created a pull request and was browsing through, the differences are shown with light red/green line-brackgrounds, but some text is bolded with a red text background...

Update: Image changed to show file with some highlighted comments and some not.
![GitHub comparison view showing text with red background][1]


What does this mean?

  [1]: http://i.stack.imgur.com/hH2Kf.png

What does a red text-background mean in GitHub comparison view?

I&#39;m trying to apply a patch, which I took from http://www.winehq.org/pipermail/wine-devel/2014-May/104356.html. I copied it into a text editor, and saved it as `my.patch` (I needed to fix the email, it had been obfuscated).

I tried to apply it with Git, but I&#39;m getting this error:

    sashoalm@sashoalm-VirtualBox:~/Desktop/wine-git$ git am --signoff &lt;my.patch
    previous rebase directory /home/sashoalm/Desktop/wine-git/.git/rebase-apply still exists but mbox given.

This cryptic error message gives me no idea what&#39;s wrong or what I need to do to make it work. What does this error mean? And how do I fix it?

Git error: previous rebase directory .git/rebase-apply still exists but mbox given

I need to do a `PATCH` request with the `Windows.Web.Http.HttpClient` class and there is no official documentation on how to do it. How can I do this?

PATCH Async requests with Windows.Web.Http.HttpClient class

According to my knowledge:

- `PUT` - update object with its whole representation (replace)
- `PATCH` - update object with given fields only (update)

I&#39;m using Spring to implement a pretty simple HTTP server. When a user wants to update his data he needs to make a HTTP `PATCH` to some endpoint (let&#39;s say: `api/user`). His request body is mapped to a DTO via `@RequestBody`, which looks like this:

    class PatchUserRequest {
        @Email
        @Length(min = 5, max = 50)
        var email: String? = null
    
        @Length(max = 100)
        var name: String? = null
        ...
    }

Then I use an object of this class to update (patch) the user object:

    fun patchWithRequest(userRequest: PatchUserRequest) {
        if (!userRequest.email.isNullOrEmpty()) {
            email = userRequest.email!!
        }
        if (!userRequest.name.isNullOrEmpty()) {
            name = userRequest.name
        }    
        ...
    }

My doubt is: what if a client (web app for example) would like to clear a property? I would ignore such a change. 

**How can I know, if a user wanted to clear a property (he sent me null intentionally) or he just doesn&#39;t want to change it? It will be null in my object in both cases.**

I can see two options here:

- Agree with the client that if he wants to remove a property he should send me an empty string (but what about dates and other non-string types?)
- Stop using DTO mapping and use a simple map, which will let me check if a field was given empty or not given at all. What about request body validation then? I use `@Valid` right now.

How should such cases should be properly handled, in harmony with REST and all good practices?

**EDIT:**

One could say that `PATCH` shouldn&#39;t be used in such an example, and I should use `PUT` to update my User. But what about model changes (e.g. adding a new property)? I would have to version my API (or the user endpoint alone) after every User change. E.g. I would have `api/v1/user` endpoint which accepts `PUT` with an old request body, and `api/v2/user` endpoint which accepts `PUT` with a new request body. I guess it&#39;s not the solution and `PATCH` exists for a reason.

How to do PATCH properly in strongly typed languages based on Spring - example

I&#39;ve been trying to implement some unit tests for a module. An example module named *alphabet.py* is as follows:

    import database

    def length_letters():
        return len(letters)

    def contains_letter(letter):
        return True if letter in letters else False


    letters = database.get(&#39;letters&#39;)   # returns a list of letters


I&#39;d like to mock the response from a database with some values of my choice, but the code below doesn&#39;t seem to work.

    import unittests  
    import alphabet   
    from unittest.mock import patch   
      
      
    class TestAlphabet(unittest.TestCase): 
        @patch(&#39;alphabet.letters&#39;)
        def setUp(self, mock_letters):
            mock_letters.return_value = [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;]   
      
        def test_length_letters(self):
            self.assertEqual(3, alphabet.length_letters())
          
        def test_contains_letter(self):   
            self.assertTrue(alphabet.contains_letter(&#39;a&#39;))


I have seen many examples in which &#39;patch&#39; is applied to methods and classes, but not to variables. I prefer not to patch the method *database.get* because I may use it again with different parameters later on, so I would need a different response.

What am I doing wrong here?

Mocking a global variable

I have a CMS theme installed on my machine. I&#39;m tracking changes to it via git
and decided to back it up on GitHub so I could share those changes.

The theme as provided is also available on GitHub. On my machine I have added
this as a remote upstream. Now I can easily see the changes between my master
and the remote upstream by using the following command:

    git diff --color master upstream/number

If I could add the remote upstream on GitHub I could easily share these changes.
Is it possible to set this relationship on GitHub?

I have tried the following:

    git push -u origin upstreambranch

which adds an `upstreambranch` to the master on GitHub. However trying to
compare both branches doesn&#39;t work, the result I get on GitHub is that: &quot;There
isn&#39;t anything to compare&quot;

Is there an alternative way to compare these?

There isn&#39;t anything to compare. Nothing to compare, branches are entirely different commit histories

I have the following output with git-diff.

    - // sort list based on value    
    + // sort list based on value

How can I see easily see the number of removed tabs/spaces at the end of the line ?

How to show space and tabs with git-diff

Recently I enabled diff3 and it&#39;s much easier to resolve conflict now.

Previously in some cases I had to check the log to see why people did this and that to do the merge. But with diff3 the information is displayed all in one place


    &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
    THIS IS USEFUL
    ||||||| merged common ancestors
    This is useful
    =======
    This is really useful
    &gt;&gt;&gt;&gt;&gt;&gt;&gt; c2392943.....

From that we can easily see that the result should be &quot;THIS IS REALLY USEFUL&quot;

I wonder if there is any downside to diff3? Why it is not the default behavior of git?

Should diff3 be default conflictstyle on git?

My question is rather simple, though I have had no luck finding an answer.

I&#39;d like to remove the leading plus/minus symbols from each line in `git diff`. Before you ask why I wish to do this, allow me to outline my reasons:

1. Lines that are exactly 80 chars will overflow by a single character, which just looks plain awkward
2. The coloring is enough for me to distinguish between additions/deletions
3. I&#39;d prefer to keep my Terminal&#39;s window width at 80 chars (as opposed to an arbitrary 81 chars) to maintain consistency with everything else I do in my Terminal (outside of `git`)

Is there some config option for doing this? If not, how can I do this in a way that still allows me to page through my diff `less`-style?

Any insight would be greatly appreciated.

Content Type	Original Author	Original Content on Stackoverflow
Question	umläute	View Question on Stackoverflow
Solution 1 - Github	umläute	View Answer on Stackoverflow
Solution 2 - Github	Jan	View Answer on Stackoverflow

How to download a single commit-diff from GitHub?

Github Problem Overview

Github Solutions

Solution 1 - Github

Solution 2 - Github

Get the current file name in gulp.src()

How to calculate the sentence similarity using word2vec model of gensim with python

Attributions