Re: Question about git

On Sun, May 24, 2009 at 7:04 AM, Tirumurti Vasudevan <agnihot3 gmail com> wrote:
> yes it is a little difficult to keep track of what has changed since
> last commit.
> one has to look at the number of strings of each and every module.
well i made that effort to keep track and found some updates.

 e-g: Evince Document Viewer   	master  	97  97% (318/3/4)  	

ok so i want to work at it again.
i chage to the relevant dir and say ¨git pull --rebase"  as i am supposed to.
here goes:
test/test-mime.bin: needs update
test/test-page-labels.pdf: needs update
thumbnailer/ needs update
thumbnailer/ needs update
thumbnailer/ needs update
thumbnailer/ needs update
thumbnailer/ needs update
thumbnailer/evince-thumbnailer.c: needs update
thumbnailer/ needs update
refusing to pull with rebase: your working tree is not up-to-date
drtv narayana:~/git/evince/po$ git reset --hard HEAD^
HEAD is now at f9b57c7 [printing] Fixes crash found by tests
drtv narayana:~/git/evince/po$ git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#       evince.pot
nothing added to commit but untracked files present (use "git add" to track)
drtv narayana:~/git/evince/po$ intltool-update ta
............................................. done.
299 translated messages, 11 fuzzy translations, 15 untranslated messages.
drtv narayana:~/git/evince/po$


so the translations done last time are not counted though in damned
lies it has been.
so from where is this file updated?
it says 299 strings not 318 as shown in da.lies

if git reset --hard HEAD^""was a wrong command here, then what would
be when it refuses to pull?

pl clarify
My blogs: [all in Tamil] photo blog now with english text too!


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]