    git reset --hard origin/master

says: throw away all my staged and unstaged changes, forget everything on my current local branch and make it exactly the same as `origin/master`.

You probably wanted to ask this before you ran the command. The destructive nature is hinted at by using the same words as in &quot;hard reset&quot;.


In newer version of git (2.23+) you can use:

    git switch -C master origin/master

`-C` is same as `--force-create`. Related [Reference Docs](https://git-scm.com/docs/git-switch#Documentation/git-switch.txt---force-createltnew-branchgt)


I&#39;m investigating how to develop a decent web app with Python. Since I don&#39;t want some high-order structures to get in my way, my choice fell on the lightweight [Flask framework][1]. Time will tell if this was the right choice.

So, now I&#39;ve set up an Apache server with mod_wsgi, and my test site is running fine. However, I&#39;d like to speed up the development routine by making the site automatically reload upon any changes in py or template files I make. I see that any changes in site&#39;s .wsgi file causes reloading (even without WSGIScriptReloading On in the apache config file), but I still have to prod it manually (ie, insert extra linebreak, save). Is there some way how to cause reload when I edit some of the app&#39;s py files? Or, I am expected to use IDE that refreshes the .wsgi file for me?


  [1]: https://flask.palletsprojects.com/en/1.1.x/

Auto reloading python Flask app upon code changes

I need to recursively search for a specified string within all files and subdirectories within a directory and replace this string with another string.

I know that the command to find it might look like this:

    grep &#39;string_to_find&#39; -r ./*

But how can I replace every instance of `string_to_find` with another string?

How to grep and replace

I did a `git pull` and got an error: 

&gt; The following working tree files would be overwritten by merge...
&gt; Please move or remove them before you can merge.

To resolve this I did the following:

    git fetch
    git reset --hard origin/master

Now when I do `git pull`, it says everything up to date. I want to know what exactly happens when I run these commands. I know `git fetch` fetches the changes from the remote repo without merging them into my local repo.

What is the meaning of `git reset --hard origin/master`? How does it work?

What is the meaning of git reset --hard origin/master?

I did a <code>git pull</code> and got an error:
> The following working tree files would be overwritten by merge...
> Please move or remove them before you can merge.
To resolve this I did the following:
<pre><code class="hljs language-sql">git fetch
git reset --hard origin/master
</code></pre>
Now when I do <code>git pull</code>, it says everything up to date. I want to know what exactly happens when I run these commands. I know <code>git fetch</code> fetches the changes from the remote repo without merging them into my local repo.
What is the meaning of <code>git reset --hard origin/master</code>? How does it work?

I am following the [instructions given here][howto] to create a Git repository. All went well until the last line:  

    $ git push -u origin master  

&gt; fatal: &#39;origin&#39; does not appear to be a git repository  
&gt; fatal: The remote end hung up unexpectedly

I&#39;m using git version 1.7.11.3 on OS X 10.6.8

    $ git remote -v  

returns nothing
  
Config file for the repository:  

    [core]
    repositoryformatversion = 0  
    filemode = true  
    bare = false
    logallrefupdates = true  
    ignorecase = true  

I&#39;ve had to open sudoers file using sudo visudo command and add the following to it (under # User privilege specification):  

    git ALL=(ALL) ALL.  

Now if I do:  

    $ git remote add origin /Volumes/500GB/git-repository/myproject.git  

it comes back with no error, but I don&#39;t see any code in the repository
(it has the aforementioned directories like branches, hooks, ...)  
    
If I do:
      
    $ git push -u origin master  
    fatal: &#39;origin&#39; does not appear to be a git repository
    fatal: The remote end hung up unexpectedly

    $ git remote -v   
    origin /Volumes/500GB/git-repository/myproject.git (fetch)     
    origin /Volumes/500GB/git-repository/myproject.git (push)

[howto]: http://qugstart.com/blog/ruby-and-rails/create-a-new-git-remote-repository-from-some-local-files-or-local-git-repository/

Git push error: &quot;origin does not appear to be a git repository&quot;

I would like to completely empty the master branch in Git. For now, I would also like to keep all other branches which have been branched from master.

Is this possible and how?

How can I completely empty the master branch in Git?

I&#39;m trying to set up pretty format colors for Git.  From what I can tell version 1.6.0 only recognizes red, green and blue.

    $ git log --pretty=format:&quot;%Credred%Creset %Cgreengreen%Creset %Cyellowyellow%Creset %Cblueblue%Creset %Cmagentamagenta%Creset %Ccyancyan%Creset %Cwhitewhite%Creset&quot;
    red green %Cyellowyellow%Creset blue %Cmagentamagenta %Ccyancyan %Cwhitewhite

**In addition none of the colors work with the parenthesized color format.**

Is there a way to list the available pretty format colors for Git?

Unfortunately this is on a legacy SCO OpenServer 5.0.7 machine and the last version of Git released by SCO Skunkworks was 1.6.0.3.

Git pretty format colors

From emacs, how can I see the details (e.g. commit message) of the commit that last changed the line at point?

I have magit installed.

git blame with commit details in emacs

What is the correct way to handle symlinks in git?

I have the following structure:

    Vendors
      Module A
      Module B
      Module C
    App
     Code
       Modules
         Core Module 1
         Core Module 2
         Module A (symlinked to vendors)
         Module B (symlinked to vendors)
         Module C (symlinked to vendors)



There is a a main App directory which contains all of the core code in the application.  Additionally there is a vendor directory that contains modules which get symlinked into the main app directory and therefore integrated.

Importantly, both the vendor directory and the main app directory are both versioned in the same repository.  

Therefore, should i let git keep storing the symlinks, or find a way to have it ignore symlinks?


Git - how to handle symlinks

I&#39;ve been working on my project remotely through the command line on a machine to which I don&#39;t have admin rights and after running `git push origin master` I get the following error message:

    (gnome-ssh-askpass:29241): Gtk-WARNING **: cannot open display:

My `.git/config` file has the following contents:

&gt;         [core]
&gt;            repositoryformatversion = 0
&gt;            filemode = true
&gt;            bare = false
&gt;            logallrefupdates = true 
&gt;         [remote &quot;origin&quot;]
&gt;            fetch = +refs/heads/*:refs/remotes/origin/*
&gt;            url = https://username@github.com/username/repository.git 
&gt;         [branch &quot;master&quot;]
&gt;            remote = origin
&gt;            merge = refs/heads/master

I was getting the 403 error earlier. Following the comment [here][1], I put my username before the @ sign in the remote url and since then, I&#39;ve been getting the Gtk error.

When I login to the machine using `ssh -X` and try to push, I get the following error:


    X11 connection rejected because of wrong authentication.
    (gnome-ssh-askpass:31922): Gtk-WARNING **: cannot open display:localhost:10.0

If I change the url of the remote to `git@github.com:username/repository.git`, then the error is:

    ssh: connect to host github.com port 22: Connection timed out
    fatal: The remote end hung up unexpectedly

Do you know how to fix this?


  [1]: https://stackoverflow.com/questions/7438313/pushing-to-git-returning-error-code-403-fatal-http-request-failed/9575906#9575906



git produces Gtk-WARNING: cannot open display

I just started using Git and I got really confused between different branches. Can anyone help me to figure out what the following branch types are?

* local branches
* local tracking branches
* remote branches 
* remote tracking branches 

What is the difference between them? And how do they work with each other?

A quick demo code will be really helpful I guess.

What are the differences between local branch, local tracking branch, remote branch and remote tracking branch?

We are some developers who work on same project and we use git for the project. If two or more of us happen to work on same file, we receive git conflicts which are hard to deal with, sometimes changes done by one developer are lost when these conflicts happen.

How do they work with git in a team? What should be the proper flow in order to avoid git conflicts ?


Thanks in advance.

How to avoid git conflicts in a team?

I&#39;m very new to Git. I&#39;ve been searching for an answer, but I couldn&#39;t find one.

In my computer I have a project folder like this:

    project_a
    --some_folder
    --another_folder
    --.git

And I have a repository on GitHub, let’s say `https://github.com/company/our_repo.git`. Under this repository I have some folders. So my goal is to put my `project_a` under `trunk/bin`. How do I achieve this? (Again, I&#39;m very very very new.)



How to add my current project to an already existing GitHub repository

I set up my Github with android studio, everything worked fine, the problem now is though, that I can&#39;t seem to turn off, or get out of version control to use the IDE normally again. 

This means that errors aren&#39;t shown, and it is really hard to debug because of this. 

So how do I turn off version control (VCS) in Android Studio?


How do you turn off version control in android studio?

In one of my development branches, I made some changes to my codebase. Before I was able to complete the features I was working on, I had to switch my current branch to master to demo some features. But just using a &quot;git checkout master&quot; preserved the changes I also made in my development branch, thus breaking some of the functionality in master. So what I did was commit the changes on my development branch with a commit message &quot;temporary commit&quot; and then checkout master for the demo.

Now that I&#39;m done with the demo and back to work on my development branch, I would like to remove the &quot;temporary commit&quot; that I made while still preserving the changes I made. Is that possible?

Can I delete a git commit but keep the changes?

As Git user I regular come across the situation, that I need to rework one or more commits in a way which do not fit into `--amend` or `rebase -i`with fixup commits. Typically I would do something like

    git reset HEAD~1
    # hack, fix, hack
    git commit -a
    # argh .. do I need to retype my message?
 
I take sensible composed commit messages quite serious. They typically contain larger text with references &amp; justifications for the change. Until now, I&#39;m quite annoyed on the lengthy process to recover my old commit message via an unsorted `git reflog`, `git log`and copy &amp; paste process.

Is there a better to tackle this? And how would it, if my comprises more than one commit?

_Edit:_ After a bit thinking about this I think what I&#39;m looking for is some _git stash_-like functionality for commit messages where fixup/amend commits are not appropriate.

Git: How to reuse/retain commit messages after &#39;git reset&#39;?

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?

I have a git repository which holds a Drupal site.  I spent the last day trying to build a feature using several different modules.  I have given up on my current approach and have decided to try a different combination of modules.  However, my repository has several commits on the master branch that contain this feature development process (I understand that I did not branch in an effective manner.)  I want to get rid of the last three or four commits and set master to that point in my history (I don&#39;t want to merge my current work with anything, I just want it to go away.)  How do I do this?




How do I move master back several commits in git?

I tried to undo my commit in git. Is it dangerous to use `git reset --hard HEAD~1`?

What is the difference between different options for `git reset`?


Content Type	Original Author	Original Content on Stackoverflow
Question	jimcgh	View Question on Stackoverflow
Solution 1 - Git	CB Bailey	View Answer on Stackoverflow
Solution 2 - Git	the_spectator	View Answer on Stackoverflow

What is the meaning of git reset --hard origin/master?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

How to grep and replace

Auto reloading python Flask app upon code changes

Attributions