| [translations] Re: how to remove a file |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: LilyPond Translation <translations@xxxxxxxxxxx>
- Subject: [translations] Re: how to remove a file
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Sun, 06 May 2012 17:32:08 +0200
- Cc: Lily-Devel List <lilypond-devel@xxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=2GZWQQCPSpVFkQFPmIoIGtctZcDSZuvbiTawRPvh3z8=; b=DD8/klFFHyUbRAznsl0W+CaWx6cD0dc4UHHkGNWc//mP5FJLb1qAi1AwOxpqBUAizc ev0FFhBrccKABVNjuR0AdcwADUvpDC7eW/dXTNVZvQTPeS/kEU4s5EVg7Im09GZ4TNIO ZZlmV0k86qHU+zuBlT6LczkQ3NPYhMQmNq+yc4mtaURE/lg7x1Cs/eSiEg/tcYwpqd8i syKozFYeEbPknd7vEhrrte7FpAztlxNqVAYXQSY0ZuFq38/ruUsbI8syLmxamjmLYyEl nlZj+WG26sVcnIkVt93PruQW9Ydx05nOSO92aiKvyft34z5aPNJN2JOGw1Drqqbz4DcP Garg==
I'm putting -devel in CC.
Sorry for pushing, I'm in a hurry: I'd like to send the patches within
tonight.
Il 06/05/2012 15:53, Federico Bruni ha scritto:
Hi,
I have to remove the .texidoc file of a snippet which has been removed:
diff --git
a/Documentation/snippets/piano-template-with-centered-dynamics.ly
b/Documentation/snippets/piano-template-with-centered-dynamics.ly
deleted file mode 100644
index f56fc58..0000000
--- a/Documentation/snippets/piano-template-with-centered-dynamics.ly
+++ /dev/null
I wonder if I should use 'rm' or 'git rm'.
I know that the difference is that rm keeps the file in the git index,
while git rm removes it both from index and working copy.
I think that I should use git rm, but I prefer asking as I have a poor
understanding of git.
Thanks,
Federico
I made a try:
$ git rm
Documentation/it/texidocs/piano-template-with-centered-dynamics.texidoc
error:
'Documentation/it/texidocs/piano-template-with-centered-dynamics.texidoc' has
local modifications
(use --cached to keep the file, or -f to force removal)
What's the recommended method?