checkout by providing the current path, `.`:

`git checkout other-branch-name -- .`

This operation is similar to [switching HEAD to another branch without checking out files][1], but just from the &quot;other direction&quot;.


  [1]: https://stackoverflow.com/questions/1282639/switch-git-branch-without-files-checkout

As @김민준 mentions, this overwrites any uncommitted changes. Remember to either stash or commit them somewhere first if needed.

Similar to [@Kache&#39;s answer](https://stackoverflow.com/a/15536640/5532169), but using the newer [`git restore`](https://git-scm.com/docs/git-restore) command (requires Git version 2.23 or above):

```sh
git restore --source=&lt;other-branch/tag/commit&gt; &lt;pathspec&gt;
# or
git restore -s &lt;other-branch/tag/commit&gt; &lt;pathspec&gt;

# example: to load all files from branch &quot;other&quot;
git restore -s other .
```

This new command was introduced to split &quot;checking out a branch&quot; and &quot;checking out files&quot; out of the single `git checkout` command. Read more: [What is the `git restore` command](https://stackoverflow.com/q/58003030/5532169).

How do I set a variable in the parent shell, from a subshell?

    a=3
    (a=4)
    echo $a

Set a parent shell&#39;s variable from a subshell

I&#39;m trying to get a simple while loop working in bash that uses two conditions, but after trying many different syntax from various forums, I can&#39;t stop throwing an error. Here is what I have:

    while [ $stats -gt 300 ] -o [ $stats -eq 0 ]

I have also tried:

    while [[ $stats -gt 300 ] || [ $stats -eq 0 ]]

... as well as several others constructs. I want this loop to continue while `$stats is &gt; 300` or if `$stats = 0`.

Bash scripting, multiple conditions in while loop

I want to load a different version of the files that exist in another branch into my current branch.


`git help checkout` says:

    DESCRIPTION
       Updates files in the working tree to match the version in the index or
       the specified tree. If no paths are given, git checkout will also
       update HEAD to set the specified branch as the current branch.


Is there a way to checkout all those files, but _not_ update HEAD?

git: checkout files from another branch into current branch (don&#39;t switch HEAD to the other branch)

I want to load a different version of the files that exist in another branch into my current branch.
<code>git help checkout</code> says:
<pre><code class="hljs language-sql">DESCRIPTION
 Updates files in the working tree to match the version in the index or
 the specified tree. If no paths are given, git checkout will also
 update HEAD to set the specified branch as the current branch.
</code></pre>
Is there a way to checkout all those files, but not update HEAD?

Is there a way to tell when a stash was created?

`git stash list` only lists the stashes, and `git stash show XXXXXX` shows all the files and changes, but not the **date** of the stash creation.

Get the creation date of a stash

I&#39;m using IntelliJ with a Git project, and have setup my `user.name` and `user.email` properly. The problem is when committing using the IDE interface the author is not selected by default. I can click and I get a dropdown to select it, but sometimes I forget to do that, and it&#39;s a pain to ammend the commit each time I forget.

Is there a way to set the author automatically on commit, since it&#39;s only one, and it would save me some headaches?

IntelliJ IDEA with Git remember author

I am under a proxy and I am pushing in to git successfully for quite a while.&lt;br&gt;
Now I am not able to push into git all of a sudden.&lt;br&gt;
I have set the RSA key and the proxy and double checked them, with no avail and git is throwing me the error shown in the title of the page.


ssh: connect to host github.com port 22: Connection timed out

Is there a difference between `git rebase upstream/master` and `git pull --rebase upstream master`, and if so, what? The remote could be any remote, not necessarily upstream.

git rebase upstream/master vs git pull --rebase upstream master

Is there a one-command way to get an up-to-date mirror of a remote repo? 
That is

 - if local repo not there yet: clone
 - if it&#39;s there: pull

I know I could script this around (e.g `if [ -d repo ]; then (cd repo &amp;&amp; git pull); else git clone $repourl;fi
`) , but I need the simplest possible cross-platform way (actually used for Jenkins-CI, which I know does this by default, however I need 2 repos for which support is limited).



Git has similar shortcuts for other things (eg. checkout -b, and pull itself), so I&#39;m wondering if I missed something. Thanks!

Git shortcut to pull with clone if no local there yet?

When I was browsing GitHub repositories I quite often saw &quot;wip&quot; branches (e.g. `3.1.0-wip`). What does &quot;wip&quot; mean?

I couldn&#39;t find the answer anywhere - neither on Google nor on GitHub:help.

GitHub: What is a &quot;wip&quot; branch?

I&#39;m currently busy with a project with a lot of branches and I have a tag for last changes which where done on one of the branches. But it&#39;s not clear for me on which branch this tag is. 

How to find out on which branch a tag is?

Git: How to find out on which branch a tag is?

Say I&#39;ve forked a node module with a bugfix and I want to use my fixed version, on a feature branch of course, until the bugfix is merged and released. 

How would I reference my fixed version in the `dependencies` of my `package.json`?

Depend on a branch or tag using a git URL in a package.json?

If you try to follow the git-flow branching model, [documented here][1] and with [tools here][2], how should you handle this situation:

You have made a 1.0 release and a 2.0 release. Then you need to make a hotfix for 1.0. You create a hotfix branch off the 1.0 tag and implement the fix there. But what then?

Normally you would merge to master and put a 1.1 release tag there. But you can&#39;t merge 1.1 to a point after 2.0 on master.

I guess you could put the release tag on the hotfix branch, but that would create a permanent branch beside the master that would contain a release tag. Is that the right way?


  [1]: http://nvie.com/posts/a-successful-git-branching-model/
  [2]: https://github.com/nvie/gitflow

Following git-flow how should you handle a hotfix of an earlier release?

I want to have my local and remote repositories always in sync in terms of branches.

After a Pull Request review on GitHub, I merge and remove my branch there (remote).
How could I fetch this information in my local repository and get Git to remove my local version of the branch as well?

Delete local Git branches after deleting them on the remote repo

I reset my local master to a commit by this command:

    git reset --hard e3f1e37

when I enter `$ git status` command, terminal says:

    # On branch master
    # Your branch is behind &#39;origin/master&#39; by 7 commits, and can be fast-forwarded.
    
    #   (use &quot;git pull&quot; to update your local branch)
    #
    nothing to commit, working directory clean

Since I want to reset origin/header as well, I checkout to origin/master:

    $ git checkout origin/master
    Note: checking out &#39;origin/master&#39;.
    
    You are in &#39;detached HEAD&#39; state. You can look around, make experimental
    changes and commit them, and you can discard any commits you make in this
    state without impacting any branches by performing another checkout.
    
    If you want to create a new branch to retain commits you create, you may
    do so (now or later) by using -b with the checkout command again. Example:
    
      git checkout -b new_branch_name
    
    HEAD is now at 2aef1de... master problem fixed for master. its okay now.

and reset the header by this command:

    $ git reset --hard e3f1e37
    HEAD is now at e3f1e37 development version code incremented for new build.

Then I tried to add commit to origin/header that I was not successful.

    $ git commit -m &quot;Reverting to the state of the project at e3f1e37&quot;
    # HEAD detached from origin/master
    nothing to commit, working directory clean

Finally, I checkout to my local master.

    $ git checkout master
    Switched to branch &#39;master&#39;
    Your branch is behind &#39;origin/master&#39; by 7 commits, and can be fast-forwarded.
      (use &quot;git pull&quot; to update your local branch)

Since, I reset the head of origin/master I expect local and origin should be in same direction but as you see, git is saying that my local/master is behind origin/master by 7 commits.

How can I fix this issue? The things that I&#39;m looking for is Head of local/master and origin/master point to same commit. Following image shows what I did. Thanks.

![enter image description here][1]


  [1]: http://i.stack.imgur.com/fuQB3.png

Git, How to reset origin/master to a commit?

Creating and using a new branch involves two commands:

    $ git branch new_branch_name
    $ git checkout new_branch_name

I tend to forget the latter, which can be annoying. Is there a way to do this using a single command? Perhaps using an alias, or something similar? I know I could write a shell function, but that seems a bit much work for such a simple and common task.

Bazaar does support this to some degree using the `bzr branch --switch` notation.

branch and checkout using a single command

I have a git repository. It has A B C D E ... commits. Now I want to checkout D as a new branch named Dbranch. So I excute:`git checkout D -b Dbranch`. And now I want to delete this branch. Firstly I need to switch to master branch , and then use `git branch -d Dbranch` to delete it. But when I excute `git checkout master`, it gives me the error. 

    error: The following untracked working tree files would be overwritten by checkout:
    	source/a/foo.c
            ...... (too many lines)
    Please move or remove them before you can switch branches.
    Aborting

How to delete the Dbranch?

git checkout master error: the following untracked working tree files would be overwritten by checkout

Is there a Git command (or a short sequence of commands) that will safely and surely do the following?

- Get rid of any local changes.
- Fetch the given branch from origin if necessary
- Checkout the given branch?

Currently I&#39;m stuck with:

    git fetch -p
    git stash
    git stash drop
    git checkout $branch
    git pull

but it&#39;s bothering me because I&#39;m asked for password two times (by `fetch` and `pull`). **Generally I would be happy with any solution as long as the password is needed only once.**

A couple of notes:

- It&#39;s a part of homebrewed deployment script for an application (the code is hosted on GitHub).
- There should be no difference if the branch was already fetched from origin or not (i.e. the first deployment of a new branch shouldn&#39;t ideally require any additional steps).
- The script is located on a remote machine that can be accessed by several people, hence no credentials are stored and user/password must be entered (but only once if possible).
- I don&#39;t care about any local changes; I always want a pristine copy of the given branch (the further part of deployment script produces local changes).
- I can&#39;t clone or export a fresh repository each time; it takes too much time.



Git command to checkout any branch and overwrite local changes

The following is the command I use to checkout a specific commit.

    git clone git://repo.git/repo123
    git checkout &lt;commitID&gt;

I want to do the above in one step - using a git clone command only. 

The reason why I want to do this is, repo123 is very huge. So checking out the commit I want will save me a lot of time.

I am aware of `--depth` option. But in this case, it is of no use. Can anyone tell me how to do it?

Content Type	Original Author	Original Content on Stackoverflow
Question	Kache	View Question on Stackoverflow
Solution 1 - Git	Kache	View Answer on Stackoverflow
Solution 2 - Git	user5532169	View Answer on Stackoverflow

git: checkout files from another branch into current branch (don't switch HEAD to the other branch)

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Bash scripting, multiple conditions in while loop

Set a parent shell's variable from a subshell

Attributions