[Gimp-docs] .gitignore (2)

julien jm.hard at wanadoo.fr
Mon Apr 27 13:04:51 PDT 2009


Hi Roman,
> On Mon, Apr 27, 2009 at 08:27:52AM +0200, julien wrote:
>> and after git commit -a -m "Updated glossary":
>>
>> Created commit 665d34a: Updated glossary
>>  3 files changed, 773 insertions(+), 771 deletions(-)
>> ...~/Git/gimp-help-2> git pull --rebase
>> Enter passphrase :
>> First, rewinding head to replay your work on top of it...
>> Applying Updated glossary
>> error: patch failed: src/glossary/glossary.xml:167
>> error: src/glossary/glossary.xml: patch does not apply
>> Using index info to reconstruct a base tree...
>> Falling back to patching base and 3-way merge...
>> Auto-merged .gitignore
>> Auto-merged src/glossary/glossary.xml
>>
>> Is this commit OK now??
> To me, it doesn't look that your commit made it through:
> 
> http://git.gnome.org/cgit/gimp-help-2/

Under Git, if I well understand, 'commit' is different from SVN commit.
Under Git, commit updates the local repository from the Index. Then we
can send a patch to the git remote repository using "push"...
And I have not used push yet.

Julien



More information about the Gimp-docs mailing list