From: ludo@gnu.org (Ludovic Courtès)
To: Federico Beffa <beffa@ieee.org>
Cc: Guix-devel <guix-devel@gnu.org>
Subject: Re: .po files and git pull --rebase
Date: Wed, 05 Nov 2014 21:29:43 +0100 [thread overview]
Message-ID: <874mud2xxk.fsf@gnu.org> (raw)
In-Reply-To: <CAKrPhPPV+oRk1xZx=F80tsQ8fLe22YxvJHr=Rdv9R7TDxx-k5g@mail.gmail.com> (Federico Beffa's message of "Wed, 5 Nov 2014 18:34:59 +0100")
Federico Beffa <beffa@ieee.org> skribis:
> Now, "git status" tells me that there are the following .po files
> which are modified and not staged:
>
> # On branch master
> # 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: po/guix/cs.po
> # modified: po/guix/de.po
> # modified: po/guix/eo.po
> # modified: po/guix/hu.po
Those files are updated typically when running ‘make dist’ (it’s really
just gettext adjusting the line numbers, adding new translatable
strings, etc.)
It’s safe to discard those changes, for instance with:
git reset --hard
(Beware, this command discards all uncommitted changes!)
> Is it OK to tell git to ignore those files with:
>
> git update-index --assume-unchanged po/guix/cs.po
I’m not sure what it does but it sounds too low-level.
HTH,
Ludo’.
prev parent reply other threads:[~2014-11-05 20:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-05 17:34 .po files and git pull --rebase Federico Beffa
2014-11-05 20:29 ` Ludovic Courtès [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874mud2xxk.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=beffa@ieee.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.