Use &lt;kbd&gt;⌘&lt;/kbd&gt; (OSX) or &lt;kbd&gt;CTRL&lt;/kbd&gt; (Windows and Linux) and choose any two commits you like in log view. It does not matter what branch the commits belong to. 

As a result you will see something like...

&gt; Displaying all changes between f03a18bf0370c62bb5fb5c6350589ad8def13aea and 4a4b176b852e7c8e83fffe94ea263042c59f0548

...down below.

Another way to do this is to right-click on a branch and select the &quot;Diff against current&quot; context menu command (_current_ refers to the branch you are currently working on). This will give you the diff between the head commits of the two branches. 

Source: https://answers.atlassian.com/questions/167126/sourcetree-diff-against-current-behavior#

Screenshot (based on Sourcetree v1.9.5):

[![enter image description here][1]][1]

After choosing &quot;Diff against Current&quot; from the context menu, you should see a message to the effect of:

&gt; Displaying all changes between {commit_hash} and working copy

[![After choosing to &quot;Diff against Current&quot; you should see a list of files that have changed, beneath the message &quot;Displaying all changes between {commit_hash} and working copy&quot;][2]][2]


  [1]: http://i.stack.imgur.com/yEDGH.png
  [2]: https://i.stack.imgur.com/HqCWq.png

You can also do this by ctrl + clicking the two &lt;s&gt;branches&lt;/s&gt; commits you want to diff.

You can also use an External Diff tool. For example I am using Beyond Compare. After you set it as an external diff tool in sourcetree, you select both files you want to compare using CTRL and after that you press CTRL+D. As a result, Beyond Compare will be launched with both files ready to be compared.

I&#39;m trying to write a wrapper around an api my company is developing.  It&#39;s restful, and using Postman I can send a post request to an endpoint like `http://subdomain.dev.myapi.com/api/v1/auth/` with a username and password as POST data and I am given back a token.  All works as expected.  Now, when I try and do the same from PHP I get back a `GuzzleHttp\Psr7\Response` object, but can&#39;t seem to find the token anywhere inside it as I did with the Postman request.  

The relevant code looks like: 

    $client = new Client([&#39;base_uri&#39; =&gt; &#39;http://companysub.dev.myapi.com/&#39;]);
    $response = $client-&gt;post(&#39;api/v1/auth/&#39;, [
        &#39;form_params&#39; =&gt; [
            &#39;username&#39; =&gt; $user,
            &#39;password&#39; =&gt; $password
        ]
    ]);

    var_dump($response); //or $resonse-&gt;getBody(), etc...

The output of the code above looks something like (warning, incoming wall of text):

    object(guzzlehttp\psr7\response)#36 (6) {
      [&quot;reasonphrase&quot;:&quot;guzzlehttp\psr7\response&quot;:private]=&gt;
      string(2) &quot;ok&quot;
      [&quot;statuscode&quot;:&quot;guzzlehttp\psr7\response&quot;:private]=&gt;
      int(200)
      [&quot;headers&quot;:&quot;guzzlehttp\psr7\response&quot;:private]=&gt;
      array(9) {
        [&quot;connection&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(10) &quot;keep-alive&quot;
        }
        [&quot;server&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(15) &quot;gunicorn/19.3.0&quot;
        }
        [&quot;date&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(29) &quot;sat, 30 may 2015 17:22:41 gmt&quot;
        }
        [&quot;transfer-encoding&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(7) &quot;chunked&quot;
        }
        [&quot;content-type&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(16) &quot;application/json&quot;
        }
        [&quot;allow&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(13) &quot;post, options&quot;
        }
        [&quot;x-frame-options&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(10) &quot;sameorigin&quot;
        }
        [&quot;vary&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(12) &quot;cookie, host&quot;
        }
        [&quot;via&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(9) &quot;1.1 vegur&quot;
        }
      }
      [&quot;headerlines&quot;:&quot;guzzlehttp\psr7\response&quot;:private]=&gt;
      array(9) {
        [&quot;connection&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(10) &quot;keep-alive&quot;
        }
        [&quot;server&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(15) &quot;gunicorn/19.3.0&quot;
        }
        [&quot;date&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(29) &quot;sat, 30 may 2015 17:22:41 gmt&quot;
        }
        [&quot;transfer-encoding&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(7) &quot;chunked&quot;
        }
        [&quot;content-type&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(16) &quot;application/json&quot;
        }
        [&quot;allow&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(13) &quot;post, options&quot;
        }
        [&quot;x-frame-options&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(10) &quot;sameorigin&quot;
        }
        [&quot;vary&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(12) &quot;cookie, host&quot;
        }
        [&quot;via&quot;]=&gt;
        array(1) {
          [0]=&gt;
          string(9) &quot;1.1 vegur&quot;
        }
      }
      [&quot;protocol&quot;:&quot;guzzlehttp\psr7\response&quot;:private]=&gt;
      string(3) &quot;1.1&quot;
      [&quot;stream&quot;:&quot;guzzlehttp\psr7\response&quot;:private]=&gt;
      object(guzzlehttp\psr7\stream)#27 (7) {
        [&quot;stream&quot;:&quot;guzzlehttp\psr7\stream&quot;:private]=&gt;
        resource(40) of type (stream)
        [&quot;size&quot;:&quot;guzzlehttp\psr7\stream&quot;:private]=&gt;
        null
        [&quot;seekable&quot;:&quot;guzzlehttp\psr7\stream&quot;:private]=&gt;
        bool(true)
        [&quot;readable&quot;:&quot;guzzlehttp\psr7\stream&quot;:private]=&gt;
        bool(true)
        [&quot;writable&quot;:&quot;guzzlehttp\psr7\stream&quot;:private]=&gt;
        bool(true)
        [&quot;uri&quot;:&quot;guzzlehttp\psr7\stream&quot;:private]=&gt;
        string(10) &quot;php://temp&quot;
        [&quot;custommetadata&quot;:&quot;guzzlehttp\psr7\stream&quot;:private]=&gt;
        array(0) {
        }
      }
    }

The output from Postman was something like:

    {
        &quot;data&quot; : {
            &quot;token&quot; &quot;fasdfasf-asfasdfasdf-sfasfasf&quot;
        }
    }

Clearly I&#39;m missing something about working with the response objects in Guzzle.  The Guzzle response indicates a 200 status code on the request, so I&#39;m not sure exactly what I need to do to retrieve the returned data.

Guzzlehttp - How get the body of a response from Guzzle 6?

I am getting following exception while running the tests. I am using Mockito for mocking. The hints mentioned by Mockito library are not helping.

```none
org.mockito.exceptions.misusing.UnfinishedStubbingException: 
Unfinished stubbing detected here:
	-&gt; at com.a.b.DomainTestFactory.myTest(DomainTestFactory.java:355)

	E.g. thenReturn() may be missing.
	Examples of correct stubbing:
		when(mock.isOk()).thenReturn(true);
		when(mock.isOk()).thenThrow(exception);
		doThrow(exception).when(mock).someVoidMethod();
	Hints:
	 1. missing thenReturn()
	 2. you are trying to stub a final method, you naughty developer!

		at a.b.DomainTestFactory.myTest(DomainTestFactory.java:276)
        ..........
```

Test Code from `DomainTestFactory`. When I run the following test, I see the exception.

    @Test
    public myTest(){
        MyMainModel mainModel =  Mockito.mock(MyMainModel.class);
        Mockito.when(mainModel.getList()).thenReturn(getSomeList()); // Line 355
    }

	private List&lt;SomeModel&gt; getSomeList() {
	    SomeModel model = Mockito.mock(SomeModel.class);
     	Mockito.when(model.getName()).thenReturn(&quot;SomeName&quot;); // Line 276
    	Mockito.when(model.getAddress()).thenReturn(&quot;Address&quot;);
    	return Arrays.asList(model);
 	}

	public class SomeModel extends SomeInputModel{
		protected String address;
		protected List&lt;SomeClass&gt; properties;
		
		public SomeModel() {
			this.Properties = new java.util.ArrayList&lt;SomeClass&gt;();	
		}
	
		public String getAddress() {
    		return this.address;
		}
	
    }

	public class SomeInputModel{
	
		public NetworkInputModel() {
			this.Properties = new java.util.ArrayList&lt;SomeClass&gt;();	
		}
		
		protected String Name;
		protected List&lt;SomeClass&gt; properties;

		public String getName() {
    		return this.Name;
		}
		
		public void setName(String value) {
	    	this.Name = value;
		}
    }



Unfinished Stubbing Detected in Mockito

Does Sourcetree offer a way to visualize differences between `git` branches?

I&#39;m looking for:

- names of files that have changed
- diffs between these files

Is there a way to get a visual diff on two branches in SourceTree?

<p>Does Sourcetree offer a way to visualize differences between <code>git</code> branches?</p>
<p>I'm looking for:</p>
<ul>
<li>names of files that have changed</li>
<li>diffs between these files</li>
</ul>


I am trying to compile the InfluxDB database (version v0.8.8) using `go get github.com/influxdb/influxdb`

But this pulls the master branch, and I need the `v0.8.8` tag.

I have tried to do:  `go get github.com/influxdb/influxdb/releases/tag/v0.8.8` but this fails saying unable to find.

I also tried to do a regular `go get` of the master branch, and then manually checking out the tag using `git` in `GOPATH/src/github...` in order to set the corret version.

The problem using the last approach is that when I try to pull the dependencies with `go get -u -f ./...` it tries to find them in the master branch, and some of them do not exist on the master branch...

**TL;DR**: perform `go get` on a specific github tag, and pull the correct dependencies.




How to do &quot;go get&quot; on a specific tag of a github repository

What&#39;s the difference between `edit` and `reword` when you do a git rebase?

I&#39;m going through some docs which say this:

    Replace pick with:
    - edit to mark a commit for amending.
    - reword to change the log message.



git rebase - what&#39;s the difference between &#39;edit&#39; and &#39;reword&#39;

When I do this:

    git clone https://example.com/root/test.git

I am getting this error:

&gt; fatal: HTTP request failed

When I use SSH:

    git clone username git@example.com:root/test.git

I am getting this error:

&gt;    Initialized empty Git repository in /server/user/git@example.com:root/test.git/.git/ &lt;br/&gt;
&gt;    fatal: &#39;user&#39; does not appear to be a git repository &lt;br/&gt;
&gt;    fatal: The remote end hung up unexpectedly

It&#39;s a private repository, and I have added my SSH keys.


How can I clone a private GitLab repository?

I know how to solve this:

    user@host$ git pull
    Updating 9386059..6e3ffde
    error: Your local changes to the following files would be overwritten by merge:
    	foo.bar
    Please, commit your changes or stash them before you can merge.
    Aborting

But isn&#39;t there a way to let `git pull` do the `stash` and `pop` dance for me?

If this command has a different name, it&#39;s ok.

Creating a shell alias for `git stash; git pull; git stash pop` is a solution, but I search for a better solution.


Can &quot;git pull&quot; automatically stash and pop pending changes?

I am trying to use `.gitignore` file to exclude `templates.js` located in `public/app/` folder. My `.gitignore` file looks like this:

    /vendor
    /node_modules
    composer.phar
    composer.lock
    .DS_Store
    templates.js

But when I check in the Git Gui, the `templates.js` file is still show in it. How can I specifically exclude a file using `.gitignore`?

.gitignore exclude specific file

I have four branches like master -&gt; origin/regacy, FeatureA -&gt; origin/FeatureA. As you can see, I typed the wrong name.

So I want to rename a remote branch name (origin/regacy → origin/legacy or origin/master)

I try the command below:

    git remote rename regacy legacy

But Git console returned an error message to me.

     error : Could not rename config section &#39;remote.regacy&#39; to &#39;remote.legacy&#39;

How can I solve this problem?


How do I rename both a Git local and remote branch name?

I was trying to create a branch from `master` with the following command,

    git branch SSLOC-201_Implement___str__()_of_ProductSearchQuery

when Git suddenly stopped responding. I suspect the unescaped `()` are to blame, somehow. Now, whenever I try to run any Git command, I get the same error:

    git:176: command not found: _of_ProductSearchQuery

with the number after `git` increasing every time I type a command.

Can anyone explain what happened? And how do I get back to normal? I&#39;d like to delete that branch, but how can I do that?

Complex Git branch name broke all Git commands

Here is my case:

 - I was working on one branch.
 - Pushed new commits to the remote.
 - Switched back to the master branch. 

But suddenly after typing `git checkout master` command my computer encountered [blue screen of death][1] and an unexpected force shut down happened. After starting back my computer I have checked the status of my current branch and as a result I got each and every file as marked new files.

Now, I am stuck at this point and after `git log` command I am getting error 

    $ git log
    fatal: your current branch appears to be broken

How to solve this problem and recover my branch?.

I am working with windows 7 and git bash latest version

&gt; Edit: **I don&#39;t want to delete this branch.**


  [1]: https://en.wikipedia.org/wiki/Blue_Screen_of_Death

Broken branch in git, fatal: your current branch appears to be broken

Say I do the following:

 1. Create branch `X`
 2. Create Tag `t` (to branch `X`)
 3. Push
 4. Remove branch `X`

What happen to tag `t`? is it just floating there? is it considered as garbage?

Should I remove all tags pointing at branch before removing the branch itself?

### Reference 
From [Git Basics - Tagging](https://git-scm.com/book/en/v2/Git-Basics-Tagging):

&gt; Git uses two main types of tags: lightweight and annotated. A
&gt; lightweight tag is very much like a branch that doesn’t change – **it’s
&gt; just a pointer to a specific commit.**

How to create a new branch on both local and remote? GIT

I have an open project in PhpStorm that I manage using SourceTree.  I was trying to remove some image files from a commit using SourceTree, but accidentally selected a file that should not be deleted.  I haven&#39;t changed anything (in either PhpStorm or SourceTree) since deleting the file.  I tried to do &lt;kbd&gt;Ctrl&lt;/kbd&gt;+&lt;kbd&gt;Z&lt;/kbd&gt; in SourceTree but nothing happened.  I then checked in PhpStorm Vcs -&gt; local history, but it didn&#39;t show the file.  How can I recover this file?

Recover deleted file from PhpStorm and SourceTree

When attempting to Push via Source Tree, I get the following error:

    git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree push -v --tags origin refs/heads/master:refs/heads/master 
    Pushing to https://user@github.com/repo.git
    To https://user@github.com/repo.git
     = [up to date]      master -&gt; master
    ...
     ! [rejected]        example_tag -&gt; example_tag (already exists)
    updating local tracking ref &#39;refs/remotes/origin/master&#39;
    error: failed to push some refs to &#39;https://user@github.com/repo.git&#39;
    hint: Updates were rejected because the tag already exists in the remote.
    Completed with errors, see above

I didn&#39;t make any changes to this tag as far as I know. How can I fix this?

&quot;Updates were rejected because the tag already exists&quot; when attempting to push in SourceTree

I Generated ssh keys and configured my git and SourceTree. I could git pull and do other operations from Git-bash. 
Note: I have added the following in .bashrc to make it work.

    eval `ssh-agent`
    ssh-add

However, when I try to git pull in SourceTree, I get this.
&gt; git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin
&gt; Permission denied (publickey,password). fatal: Could not read from
&gt; remote repository.
&gt; 
&gt; Please make sure you have the correct access rights and the repository
&gt; exists.

When I tried to create ssh-key from Putty(windows), it goes further, but waits with this following message!
 
&gt; git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin
&gt; The server&#39;s host key is not cached in the registry. You have no
&gt; guarantee that the server is the computer you think it is. The
&gt; server&#39;s rsa2 key fingerprint is:
&gt; 
&gt; ssh-rsa 2048 0f:ee:bb:1c:6c:b4:50:0e:54:d6:e9:55:9b:38:45:df If you
&gt; trust this host, enter &quot;y&quot; to add the key to PuTTY&#39;s cache and carry
&gt; on connecting. If you want to carry on connecting just once, without
&gt; adding the key to the cache, enter &quot;n&quot;. If you do not trust this host,
&gt; press Return to abandon the connection.

if I open the terminal in SourceTree(which is git-bash), it asks me for passphrase. So, i suspect my .bashrc is not sourced by SourceTree. Or am I missing something else? 



cannot pull Git remote repository from Sourcetree

I&#39;m using SourceTree on OSX and using Git to push to Visual Studio Online.  I get the following error:

&gt;POST git-receive-pack (490857233 bytes)  
    error: RPC failed; result=22, HTTP code = 404  
    fatal: The remote end hung up unexpectedly  
    Everything up-to-date  
    Completed with errors, see above

I have already tried the following:

    git config --global http.postBuffer 524288000


Git error: RPC failed; result=22, HTTP code = 404

I regularly use Atlassian SourceTree (on Mac OS X) to launch FileMerge to resolve git merge conflicts.  Out of the blue it has stopped working: when I right click and select `Resolve Conflicts &gt; Launch External Merge Tool`, FileMerge launches, creates its intermediate files, then immediately exits.  SourceTree interprets that as the merge process being complete.

What&#39;s the issue and how can I debug/fix it?

I note that a previous question &#39;[SourceTree filemerge quits immediately and creates 4 files. How to fix it?][1]&#39; does not address this particular scenario (for one, it says FileMerge quits in the title, but in the body it says FileMerge displays /dev/null as one of the panels.  Additionally, my merge conflict is not due to a removed file.)

[1]: https://stackoverflow.com/questions/16394718/sourcetree-filemerge-quits-immediately-and-creates-4-files-how-to-fix-it

Content Type	Original Author	Original Content on Stackoverflow
Question	Snowcrash	View Question on Stackoverflow
Solution 1 - Git	Anton Glukhov	View Answer on Stackoverflow
Solution 2 - Git	Gan	View Answer on Stackoverflow
Solution 3 - Git	Taran	View Answer on Stackoverflow
Solution 4 - Git	lsc05	View Answer on Stackoverflow

Is there a way to get a visual diff on two branches in SourceTree?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Unfinished Stubbing Detected in Mockito

Guzzlehttp - How get the body of a response from Guzzle 6?

Attributions