I have a git repository where the remote is hosted in TFS and when I look at the commits for a specific file there 5 commits on my dev branch. Locally i only see 3 commits on my dev branch. I've done a git pull and everything is up to date. How is this possible?
Asked
Active
Viewed 35 times
1
-
Running a `git log`, do the commit hashes match in both? What are the names of the branches on remote and local? [tig](http://jonas.nitro.dk/tig/manual.html) is a good TUI for git. – cmbuckley Jun 08 '16 at 16:22
-
See images I added. – Catfish Jun 08 '16 at 16:24
-
What does `git show --stat a1e1ff` show locally? Does it list any changes to that file? – cmbuckley Jun 08 '16 at 16:29
-
Yes it shows changes to that file. 141 insertions, 132 deletions. – Catfish Jun 08 '16 at 16:30
-
And how about `git branch -a --contains a1e1ff`? What about `git diff dev origin/dev`? I expect they are different between local and remote branches and for some reason the pull is not doing what you expect. – cmbuckley Jun 08 '16 at 16:32
-
`$ git branch -a --contains a1e1ff` shows * dev remotes/origin/dev – Catfish Jun 08 '16 at 18:28
-
`$ git diff dev origin/dev` shows nothing – Catfish Jun 08 '16 at 18:28
-
I suspect something like this: http://stackoverflow.com/questions/7541321/how-does-a-commit-disappear-from-the-log-of-one-file. Try using `git log --full-history`. – cmbuckley Jun 08 '16 at 18:50
-
@cmbuckley ahh that was it. They all show in --full-history – Catfish Jun 09 '16 at 16:36