Just go with:

    $ git cherry-pick another_branch

This will cherry-pick the last commit from another_branch.

Branches in git are just references to the last commit in that branch, you can use them instead of commit SHAs in your commands.

While debugging in Visual Studio sometimes we wander far away from the current executing statement. We could tread our way back using Call Stack window. Is there a shortcut to go back to the current executing statement in Visual Studio?

Go to current executing statement in Visual Studio while Debugging

Re,

I have the following query:

    $property = 
        Property::select(
            DB::raw(&quot;title, lat, lng, ( 
                3959 * acos( 
                    cos( radians(:lat) ) * 
                    cos( radians( lat ) ) * 
                    cos( radians( lng ) - radians(:lng) ) + 
                    sin( radians(:lat) ) * 
                    sin( radians( lat ) ) 
                ) 
            ) AS distance&quot;, [&quot;lat&quot; =&gt; $lat, &quot;lng&quot; =&gt; $lng, &quot;lat&quot; =&gt; $lat])
        )
        -&gt;having(&quot;distance&quot;, &quot;&lt;&quot;, $radius)
        -&gt;orderBy(&quot;distance&quot;)
        -&gt;take(20)
        -&gt;get();

It doesn&#39;t work: ```Invalid parameter number: mixed named and positional parameters ```.

Does anyone know a trick or a workaround (I can obviously write the full query but prefer to use fluent builder).

How to bind parameters to a raw DB query in Laravel that&#39;s used on a model?

I find myself doing this a lot when cherry-picking a commit from another branch.

    $ git log -1 another_branch
    commit &lt;commit_sha&gt;
    // copy &lt;commit_sha&gt;
    $ git cherry-pick &lt;commit_sha&gt;

Can I do all of this in one command, if so, what is it?

How to cherry-pick the last sha from another branch in Git with 1 command?

I find myself doing this a lot when cherry-picking a commit from another branch.
<pre><code class="hljs language-php-template">$ git log -1 another_branch
commit &#x3C;commit_sha>
// copy &#x3C;commit_sha>
$ git cherry-pick &#x3C;commit_sha>
</code></pre>
Can I do all of this in one command, if so, what is it?

I want to write a Bash script that loops over the sha1s of commits output by an invocation of `git log`. However, `git log` gives me much more output than I want:

    commit 0375602ba2017ba8750a58e934b41153faee6fcb
    Author: Mark Amery &lt;markamery@notmyrealemail.com&gt;
    Date:   Wed Jan 1 21:35:07 2014 +0000
    
        Yet another commit message
        
        This one even has newlines.
    
    commit 4390ee9f4428c84bdbeb2fed0a461099a6c81b39
    Author: Mark Amery &lt;markamery@notmyrealemail.com&gt;
    Date:   Wed Jan 1 21:30:19 2014 +0000
    
        Second commit message.
    
    commit bff53bfbc56485c4c1007b0884bb1c0d61a1cf71
    Author: Mark Amery &lt;markamery@notmyrealemail.com&gt;
    Date:   Wed Jan 1 21:28:27 2014 +0000
    
        First commit message.

How can I get `git log` to just output sha1s so that I can loop over them conveniently?

Show sha1 only with git log

What does &quot;remote&quot; mean? When cloning a repository located at a central location, aren&#39;t we creating its remote version?

When I execute the command

    $ git remote

I get ***origin***. What does this mean?

When I execute

    $ git branch -r

I get ***origin/master***. Now what is this?





What does &quot;git remote&quot; mean?

So I&#39;m following [this guide here to create a Github page][1]

I created a repository, cloned it to my project directory and pushed, finally got to this last step:

    Fire up a browser and go to http://username.github.io. Give it a couple of minutes for your page to show up—there will be a delay this very first time. In the future, changes will show up pretty much instantly.

My Github repo link is this:
https://github.com/leongaban/gabanco


So I assumed my Github page link would be either:&lt;br/&gt;
http://leongaban.gabanco.github.io/

or

http://leongaban.github.io/

However neither link is working at the moment :(

Anyone create a Github page before? Eventually I want to try out Jekyll on it.


  [1]: http://pages.github.com/

My new Github page isn&#39;t showing up

Initiating a push or any other action with GitHub from the command line (over https, not ssh) that calls for the username and password not only fails but, when it does, it returns 

    Username for &#39;https://github.com&#39;: username
    Password for &#39;https://username@github.com&#39;: 
    remote: Invalid username or password.
    fatal: Authentication failed for &#39;https://github.com/username/repository.git/&#39;

I do not have an `@github.com` address. The password and username are correct.

I know I could switch to SSH and use keys but that doesn&#39;t answer why the authentication is failing over https.

GitHub authentication failing over https, returning wrong email address

I recently reinstalled Windows and I have a problem with downloading files from repository.

I have installed GIT and Python, but when I am trying to download anything from Bitbucket I get the message: 

    &quot;fatal: could not read Password for: &#39;https://username@bitbucket.org&#39;: No such file or directory&quot;.

What am I doing wrong?


Bitbucket, Windows and &quot;fatal: could not read Password for&quot;

I&#39;m more of a novice when it comes to advanced operations in git. I maintain my [blog](http://jatinganhotra.com) using the blogging framework [Octopress](http://octopress.org/). Though Octopress is not under any development since 2011, it serves my purpose well and so I haven&#39;t thought of changing anything so far.

FYI, my blog is hosted on Github Pages.  

Today, while working on a new post, `git status` showed the following message:

    On branch source
    Your branch is based on &#39;origin/master&#39;, but the upstream is gone.
      (use &quot;git branch --unset-upstream&quot; to fixup)

The same message repeated for all the subsequent commands such as `git add .`, `git commit -m &#39;message&#39;` and `git push origin source`.  

 - What does the message mean?  
 - Is something broken?  
 - If yes, what?  
 - Do I need to fix it? 

If possible, please point me to a pdf/web article where I can read up on this and understand it for future.

More details:

    bash-3.2$ git branch -a
    * source
      remotes/octopress/2.1
      remotes/octopress/HEAD -&gt; octopress/master
      remotes/octopress/gh-pages
      remotes/octopress/linklog
      remotes/octopress/master
      remotes/octopress/refactor_with_tests
      remotes/octopress/rubygemcli
      remotes/octopress/site
      remotes/origin/source

Please let me know if more information is needed. Thanks.

Why call git branch --unset-upstream to fixup?

I&#39;ve pulled all remote branches via `git fetch --all`. I can see the branch I&#39;d like to merge via `git branch -a` as remotes/origin/branchname. Problem is it is not accessible. I can&#39;t merge or checkout.

Git: Merge a Remote branch locally

How do I shallow clone a git repository, so that my clone contains only 1 history item, and starts on a specific branch?

I know how to do a shallow clone:

    git clone --depth 1 https://path/to/myrepo.git

 but not start the clone on a specific branch.


How do I shallow clone a repo on a specific branch?

Alright, lets say one day we make happen to make a bunch of modifications and when we go to commit them we notice we were working on the wrong branch.

How can we force git to switch branches **without discarding local changes**.

I&#39;m probably going to go about this in a naive way while I wait a reply, but I would like to know if theres a correct procedure as I&#39;d be lying if I said this hasn&#39;t happened to me before...

 - Backup changed repo
 - `git reset --hard`
 - `git checkout right-branch`
 - Restore changes
 - `git commit -m &quot;changes&quot;`


git switch branch without discarding local changes

I am getting this message:

     First, rewinding head to replay your work on top of it...

each time I do a `git pull --rebase origin &lt;branch&gt;`, however I would like to discard all my work that may be replayed on top of it.. Basically I would like to rebase only the origin branch without my work on top of it.
How can I clean those commits that comes up wrongly all times I try to pull rebase?
Again, my goal is just pull rebase the exact snapshot of the origin branch without my work on top of it.
Thanks in advance.




Git: First rewinding head to replay

I read about that Git uses SHA-1 digest as an ID for a revision.  Why does it not use a more modern version of SHA?

Why doesn&#39;t Git use more modern SHA?

I am using php `mysqli_connect` for login to a MySQL database (all on localhost)

    &lt;?php
    //DEFINE (&#39;DB_USER&#39;, &#39;user2&#39;);
    //DEFINE (&#39;DB_PASSWORD&#39;, &#39;pass2&#39;);
    DEFINE (&#39;DB_USER&#39;, &#39;user1&#39;);
    DEFINE (&#39;DB_PASSWORD&#39;, &#39;pass1&#39;);
    DEFINE (&#39;DB_HOST&#39;, &#39;127.0.0.1&#39;);
    DEFINE (&#39;DB_NAME&#39;, &#39;dbname&#39;);

    $dbc = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
    
    if(!$dbc){
    	die(&#39;error connecting to database&#39;);	
    }
    ?&gt;

this is the mysql.user table:
[![mysql.user table][1]][1]

MySQL Server ini File:

    [mysqld]
    # The default authentication plugin to be used when connecting to the server
    default_authentication_plugin=caching_sha2_password
    #default_authentication_plugin=mysql_native_password

with `caching_sha2_password` in the MySQL Server ini file, it&#39;s not possible at all to login with user1 or user2;

&gt; error: mysqli_connect(): The server requested authentication method unknown to the client [caching_sha2_password] in...

with `mysql_native_password` in the MySQL Server ini file, it&#39;s possible to login with user1, but with user2, same error;


----------


how can I login using `caching_sha2_password` on the mySql Server?


  [1]: https://i.stack.imgur.com/fyMXv.jpg

php mysqli_connect: authentication method unknown to the client [caching_sha2_password]

I did cherry-pick from a gerrit review in my branch.
In gerrit code review, I have two patch sets and I cherry-picked patch one before, so now I want to do the second patch set, but there are conflicts, how can I force git to accept all changes?
Thanks!

force git to accept cherry-pick&#39;s changes

git sometimes gives me this message on a conflict (during a revert or cherry pick)

    hint: after resolving the conflicts, mark the corrected paths

What does this mean?

hint: after resolving the conflicts, mark the corrected paths

How can I tell cherry-pick to pick range of commits and squash it?

Or in other words, apply the diff between two commits to the current state of the repository?

The following does _not_ work (cherry-pick has no --squash option):

    git cherry-pick --squash e064480..eab48b59c

Note: My use case is within a subtree scenario - before anyone starts arguing that I should not squash.

The following works, but then I have a range of separate commits. I can squash them manually with interactive rebase afterwards.

    git cherry-pick -X subtree=vendor/package e064480..eab48b59c

Is there any way to do the squashing as part of the cherry-pick?

Cherry-pick and squash a range of commits into a subdirectory or subtree

**Background info:** 

Due to restrictions in workflow with out existing systems, we need to set up a somewhat unorthodox git process. 

    (patch)    A-B---F
      	         |   |
    (hotfix)     C-D-E
    		         |
    (dev)	   1-2-3-G
On the patch branch, there are some commits. The files here are similar but not identical to the ones on dev (sync scripts switch around the order of settings in many of the files, making them appear changed while they are functionally the same). 

A fix is needed on this branch so a hotfix branch is created and worked on. This branch is then merged back into patch, so far, so good.

This same fix needs to be deployed to the dev branch so it stays relatively in sync with patch, but trying to merge the hotfix branch leads to git trying to merge all the unrelated and &#39;unchanged&#39; files from A and B as well, rather than only C,D and E.

**Question:**

It seems that cherry-pick does what we want in terms of only getting changes from selected commits, but I would really like a way to cherry-pick all commits in a given branch at once, without having to look up the commit ids every time.  

Content Type	Original Author	Original Content on Stackoverflow
Question	FoxyGio	View Question on Stackoverflow
Solution 1 - Git	pbetkier	View Answer on Stackoverflow

How to cherry-pick the last sha from another branch in Git with 1 command?

Git Problem Overview

Git Solutions

Solution 1 - Git

How to bind parameters to a raw DB query in Laravel that's used on a model?

Go to current executing statement in Visual Studio while Debugging

Attributions