From mboxrd@z Thu Jan  1 00:00:00 1970
From: Federico Beffa <beffa@ieee.org>
Subject: .po files and git pull --rebase
Date: Wed, 5 Nov 2014 18:34:59 +0100
Message-ID: <CAKrPhPPV+oRk1xZx=F80tsQ8fLe22YxvJHr=Rdv9R7TDxx-k5g@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33277)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <federico.beffa@gmail.com>) id 1Xm4U5-0006gq-Oz
	for guix-devel@gnu.org; Wed, 05 Nov 2014 12:35:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <federico.beffa@gmail.com>) id 1Xm4U2-0002Mc-BV
	for guix-devel@gnu.org; Wed, 05 Nov 2014 12:35:05 -0500
Received: from mail-la0-x233.google.com ([2a00:1450:4010:c03::233]:59890)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <federico.beffa@gmail.com>) id 1Xm4U1-0002LR-SD
	for guix-devel@gnu.org; Wed, 05 Nov 2014 12:35:02 -0500
Received: by mail-la0-f51.google.com with SMTP id q1so1140746lam.10
	for <guix-devel@gnu.org>; Wed, 05 Nov 2014 09:34:59 -0800 (PST)
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Guix-devel <guix-devel@gnu.org>

Hi,

when I try to update my git repository with "git pull --rebase", I get
the error message:

Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.

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
#    modified:   po/guix/pt_BR.po
#    modified:   po/guix/sr.po
#    modified:   po/guix/vi.po
#    modified:   po/packages/de.po
#    modified:   po/packages/eo.po
#    modified:   po/packages/pt_BR.po
#    modified:   po/packages/sr.po
#    modified:   po/packages/vi.po
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#    doc/os-config.texi


However, I've not intentionally changed those files. I suspect that "make" did.

Is it OK to tell git to ignore those files with:

git update-index --assume-unchanged po/guix/cs.po
...

Thanks,
Fede