GIT: head has dissapeared, want to merge it into master.

Posted by samgoody on Stack Overflow See other posts from Stack Overflow or by samgoody
Published on 2010-03-25T20:15:20Z Indexed on 2010/03/25 20:23 UTC
Read the original article Hit count: 146

Filed under:

git

reflog vs GITK

The top image is the output of: git reflog.
The bottom is what GITK in GIT GUI (msysgit) shows me when I look at all branch history.

The last few commits do not show on GIT GUI.

Why do they not show on GITK (at least as a branch or something)?
How do I merge them into master?
I gather this happened when I checked out tag 0.42. Why is that not the same as master? (I had tagged the master in its latest state)
When I click push, why does the remote repo claim to be up to date.. shouldn't it try to update these commits into whatever branch they are in?

The first of the questions is important - I would like to begin to understand what GIT is thinking. It's more oracle than logic at this point.

If it makes a difference to see the earlier history, the project is a [pretty powerful] JS color picker that can be viewed here in its entirety.

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Developer IT

GIT: head has dissapeared, want to merge it into master. - Developer IT

GIT: head has dissapeared, want to merge it into master.

git

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

Can't install git on Ubuntu 12.10

Git apache : unable to push via http

git on HTTP with gitolite and nginx

Redmine git integration - issue in accessing git from redmine but not from external git client

Categories cloud