Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


On Fri, Nov 19, 2010 at 03:11:51AM -0500, Kevin Hunter <hunteke@earlham.edu> wrote:
$ git status
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#     both modified:      bf_svx/source/items/svx_xmlcnitm.cxx
#
no changes added to commit (use "git add" and/or "git commit -a")

$ git add bf_svx/source/items/svx_xmlcnitm.cxx

$ git commit
# Not currently on any branch.
nothing to commit (working directory clean)

$ git rebase --continue
Applying: EasyHack: RTL macro from createFromAscii
No changes - did you forget to use 'git add'?

As it writes, you need either 'git commit -a' or a 'git add' before 'git
commit'. :)

Attachment: pgpQpc751_8ms.pgp
Description: PGP signature


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.