Git doesn’t show how many commits ahead of origin I am, and I want it to

git

There are plenty of questions here about Git saying people are ahead of a remote branch by X commits, and they want it to stop.

I have the opposite problem. I want Git to tell me how many commits ahead I am, but it doesn't.

When I created my remote bare repository first, then cloned from it, this worked. In my current case I created the local repository first, then cloned it (bare) to the remote.

This set up my local repository as the remote for the bare repository. But I removed that, and manually added the remote repository reference to my local. Pushing works fine. But I don't see the "You are ahead by X commits" message. How can I get it?

Best Answer

git branch --set-upstream local origin/remote

local and remote are the names of your local resp. remote branches.

In Git version 1.8 and later, it's even easier. Make sure you're on the local branch, and then:

git branch --set-upstream-to origin/remote

Related Solutions

Git – Undoing a git rebase

The easiest way would be to find the head commit of the branch as it was immediately before the rebase started in the reflog...

git reflog

and to reset the current branch to it (with the usual caveats about being absolutely sure before reseting with the --hard option).

Suppose the old commit was HEAD@{2} in the ref log:

git reset --hard HEAD@{2}

In Windows, you may need to quote the reference:

git reset --hard "HEAD@{2}"

You can check the history of the candidate old head by just doing a git log HEAD@{2} (Windows: git log "HEAD@{2}").

If you've not disabled per branch reflogs you should be able to simply do git reflog branchname@{1} as a rebase detaches the branch head before reattaching to the final head. I would double check this, though as I haven't verified this recently.

Per default, all reflogs are activated for non-bare repositories:

[core]
    logAllRefUpdates = true

Git – How to undo the most recent local commits in Git

Undo a commit & redo

$ git commit -m "Something terribly misguided" # (0: Your Accident)
$ git reset HEAD~                              # (1)
[ edit files as necessary ]                    # (2)
$ git add .                                    # (3)
$ git commit -c ORIG_HEAD                      # (4)

This command is responsible for the undo. It will undo your last commit while leaving your working tree (the state of your files on disk) untouched. You'll need to add them again before you can commit them again).
Make corrections to working tree files.
git add anything that you want to include in your new commit.
Commit the changes, reusing the old commit message. reset copied the old head to .git/ORIG_HEAD; commit with -c ORIG_HEAD will open an editor, which initially contains the log message from the old commit and allows you to edit it. If you do not need to edit the message, you could use the -C option.

Alternatively, to edit the previous commit (or just its commit message), commit --amend will add changes within the current index to the previous commit.

To remove (not revert) a commit that has been pushed to the server, rewriting history with git push origin master --force is necessary.

Best Answer

Related Solutions

Git – Undoing a git rebase

Git – How to undo the most recent local commits in Git

Undo a commit & redo

Further Reading

Related Topic