* git status and diff-files don't agree on unmerged file
@ 2010-03-03 3:53 Jay Soffian
0 siblings, 0 replies; only message in thread
From: Jay Soffian @ 2010-03-03 3:53 UTC (permalink / raw)
To: git
I've run into an issue recently where I'll be rebasing, hit a
conflict, resolve it, use "git add" (I think...) but rebase doesn't
want to continue. It seems there is a disagreement between diff-files
and status while in this state:
$ git --version
git version 1.7.0.1.242.ga1f88
$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: chrome/browser/cocoa/browser_window_controller.mm
# modified: chrome/browser/cocoa/tab_strip_controller.h
# modified: chrome/browser/cocoa/tab_strip_controller.mm
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .mailmap
$ git diff-files --ignore-submodules
:100644 100644 b6ac7eb5e74d21eb7d5806f05a2ed83d6078ced3
0000000000000000000000000000000000000000
M chrome/browser/cocoa/tab_strip_controller.h
git add on the file in question resolves the problem, but shouldn't
said file show up as "unmerged" in the output of git status?
j.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-03 3:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-03 3:53 git status and diff-files don't agree on unmerged file Jay Soffian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).