-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi
I made some changes in a branch "drp" and issued a "git status" command that returned me this: - ------------------------%<---------------------- # Mudanças a serem submetidas: # (use "git reset HEAD <file>..." to unstage) # # deletado: sw/source/ui/chrdlg/drpcps.hrc # novo arquivo: sw/uiconfig/swriter/ui/dropcapspage.ui # # Changes not staged for commit: # (use "git add <arquivo>..." para atualizar o que será submetido) # (use "git checkout -- <arquivo>..." para descartar mudanças no diretório de trabalho) # (commit or discard the untracked or modified content in submodules) # # modificado: dictionaries (conteúdo não rastreado) # modificado: extras/source/glade/libreoffice-catalog.xml.in # modificado: sw/UIConfig_swriter.mk # modificado: sw/source/ui/chrdlg/drpcps.cxx # modificado: sw/source/ui/chrdlg/drpcps.src # modificado: sw/source/ui/inc/drpcps.hxx - ------------------------%<---------------------- But when I issue "git commit -a" I get the following: - ------------------------%<---------------------- # Mudanças a serem submetidas: # (use "git reset HEAD <file>..." to unstage) # # modificado: extras/source/glade/libreoffice-catalog.xml.in # modificado: sw/UIConfig_swriter.mk # modificado: sw/source/ui/chrdlg/drpcps.cxx # renomeado: sw/source/ui/chrdlg/drpcps.hrc -> sw/source/ui/chrdlg/drpcps.src # modificado: sw/source/ui/inc/drpcps.hxx # novo arquivo: sw/uiconfig/swriter/ui/dropcapspage.ui - ------------------------%<---------------------- I just want to be sure that "renomeado"(AKA renamed) is correct there, because I "git rm drpcps.hrc" and it says I am renaming it... If not, what am I supposed to do to fix it? Thanks - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJRuIhqAAoJEJp3R7nH3vLx79MIALVdRRGInv95vBpq+KngH1YN 4fAkVMP97hx+baFW9IEhtvr+O7yJAhANfHOJM0ciX2mBYzkyd8SbvRcxLnVu30Dr xpdkiZU5d8Xr6rN4mykXOJNzZKATZ1r7u/j/RyfaXjy+JLrcs4Ebo9rq64BPbVO6 Pld+Jg1zvMTYQ2gKv4EigfJqFehdN/Ki6wCEVgtbWvnKg8qON7rwtU7OtBUhukly FwrN+sKAX9tUph78ql6six4tL4aqwvJRkifuiYXgnqRrG57EO1Ud9R+E1f7fjwaS 6p+Bg2SwVO+lUWAIrZsnwZphJvwSM9Go37lkoSOMrhpoYrczmyPO8ppZ+4CtA+E= =5Jrj -----END PGP SIGNATURE----- _______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
