Re: git checkout doesn't work?

2013-01-11 Thread Duy Nguyen
On Fri, Jan 11, 2013 at 1:46 PM, Ishayahu Lastov meoc...@mail.ru wrote:
 This is my session on Win7 x64:
 Microsoft Windows [Version 6.1.7601]
 (c) Корпорация Майкрософт (Microsoft Corp.), 2009. Все права защищены.

 C:\Dropbox\Dropbox\Wesnoth\Apocryphscd Apokryphs.Orks

 C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orksgit status
 # On branch master
 # Your branch is behind 'origin/master' by 3 commits, and can be 
 fast-forwarded.

 #
 # Changes not staged for commit:
 #   (use git add file... to update what will be committed)
 #   (use git checkout -- file... to discard changes in working directory)
 #
 #   modified:   scenarios/01_NothernVillage.cfg
 #
 no changes added to commit (use git add and/or git commit -a)

 C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orkscd scenarios

 C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenariosgit status
 # On branch master
 # Your branch is behind 'origin/master' by 3 commits, and can be 
 fast-forwarded.

 #
 # Changes not staged for commit:
 #   (use git add file... to update what will be committed)
 #   (use git checkout -- file... to discard changes in working directory)
 #
 #   modified:   01_NothernVillage.cfg
 #
 no changes added to commit (use git add and/or git commit -a)

 C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenariosgit checkout -- 
 01
 _NothernVillage.cfg

 C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenariosgit status
 # On branch master
 # Your branch is behind 'origin/master' by 3 commits, and can be 
 fast-forwarded.

 #
 # Changes not staged for commit:
 #   (use git add file... to update what will be committed)
 #   (use git checkout -- file... to discard changes in working directory)
 #
 #   modified:   01_NothernVillage.cfg
 #
 no changes added to commit (use git add and/or git commit -a)

 C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenarios

 As I understand after last git checkout in git status I should see
 that I gave no changes. It looks like an bug, isn't it?

Yeah, perhaps it's file attributes. What does this say?

git diff --summary --stat
-- 
Duy
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Fwd: git checkout doesn't work?

2013-01-10 Thread Ishayahu Lastov
This is my session on Win7 x64:
Microsoft Windows [Version 6.1.7601]
(c) Корпорация Майкрософт (Microsoft Corp.), 2009. Все права защищены.

C:\Dropbox\Dropbox\Wesnoth\Apocryphscd Apokryphs.Orks

C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orksgit status
# On branch master
# Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.

#
# Changes not staged for commit:
#   (use git add file... to update what will be committed)
#   (use git checkout -- file... to discard changes in working directory)
#
#   modified:   scenarios/01_NothernVillage.cfg
#
no changes added to commit (use git add and/or git commit -a)

C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orkscd scenarios

C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenariosgit status
# On branch master
# Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.

#
# Changes not staged for commit:
#   (use git add file... to update what will be committed)
#   (use git checkout -- file... to discard changes in working directory)
#
#   modified:   01_NothernVillage.cfg
#
no changes added to commit (use git add and/or git commit -a)

C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenariosgit checkout -- 01
_NothernVillage.cfg

C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenariosgit status
# On branch master
# Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.

#
# Changes not staged for commit:
#   (use git add file... to update what will be committed)
#   (use git checkout -- file... to discard changes in working directory)
#
#   modified:   01_NothernVillage.cfg
#
no changes added to commit (use git add and/or git commit -a)

C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenarios

As I understand after last git checkout in git status I should see
that I gave no changes. It looks like an bug, isn't it?

--

сохраняйте, пожалуйста, при ответе исходный текст письма

С уважением,
начальник отдела технической поддержки
Московского Еврейского Общинного Центра
Ишаяу Ластов
телефон: +7-495-645-05-16
моб  : +7-901-569-81-86
с 12 до 18, с воскресенья по четверг
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html