In Git, I was trying to do a squash commit by merging in another branch and then resetting HEAD to the previous place via: git reset origin/master But I need to step out of this. How can I move HEAD back to the previous location? I have the SHA-1 fragment (23b6772) of the commit that … Read more
I’m having trouble finding out which tag is currently checked out. When I do: git checkout tag1 git branch I can’t seem to find out which tag I’m on. It only logs: * (no branch) master Is it possible to find out which tags are checked out? In the above example, this would be tag1. … Read more
Does anybody know the difference between these two commands to switch and track a remote branch? git checkout -b branch origin/branch git checkout –track origin/branch I think both keep track of the remote branch so I can push my changes to the branch on origin, right? Are there any practical differences? 4 Answers 4
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 ‘origin/master’ by 7 commits, and can be fast-forwarded. # (use “git pull” to update your local branch) # nothing to commit, working … Read more
What is the meaning of the double dashes before the file name in this git command? git checkout –ours — path/to/file.txt git checkout –theirs — path/to/file.txt Are they mandatory? Is it equivalent to git checkout –ours path/to/file.txt git checkout –theirs path/to/file.txt 3 Answers 3
I have recently moved from SVN to Git and am a bit confused about something. I needed to run the previous version of a script through a debugger, so I did git checkout <previous version hash> and did what I needed to do. Now I want to get back to the newest version, but I … Read more
Which one of these lines is correct? git checkout ‘another_branch’ or git checkout origin ‘another_branch’ or git checkout origin/’another_branch’ And what is the difference between them? 14 Answers 14
Using git I made something like this git clone git checkout {a rev number tree rev before} (here I started to be in a detached head state) //hacking git commit //hacking git commit (some commit where made on origin/master) git pull (which does complete because there was some error due to the fact that I’m … Read more
I was working on a git branch and was ready to commit my changes, so I made a commit with a useful commit message. I then absentmindedly made minor changes to the code that are not worth keeping. I now want to change branches, but git gives me, error: You have local changes to “X”; … Read more
I am working on a regression in the source code. I’d like to tell Git: “checkout the source based on a parameterized date/time”. Is this possible? I also have staged changes in my current view that I don’t want to lose. Ideally, I would like to toggle back and forth between the current source, and … Read more
