Paste: git status
| Author: | prunedtree |
|---|
| Mode: | text |
|---|
| Date: | Fri, 21 Nov 2008 06:43:03 |
|---|
Plain Text |
$ git status
basis/concurrency/combinators/combinators-docs.factor: needs merge
basis/values/values-docs.factor: needs merge
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: .gitignore
# modified: Makefile
# modified: basis/concurrency/combinators/combinators-tests.factor
# modified: basis/concurrency/combinators/combinators.factor
# modified: basis/fry/fry-docs.factor
# modified: basis/help/cookbook/cookbook.factor
# modified: basis/help/handbook/handbook.factor
# deleted: basis/io/encodings/utf16/.utf16.factor.swo
# modified: basis/io/unix/files/files.factor
# modified: basis/io/windows/files/files.factor
# modified: basis/locals/locals-tests.factor
# modified: basis/math/bitwise/bitwise-docs.factor
# modified: basis/math/geometry/rect/rect-docs.factor
# modified: basis/prettyprint/backend/backend.factor
# modified: basis/prettyprint/prettyprint-tests.factor
# modified: basis/prettyprint/prettyprint.factor
# modified: basis/tools/completion/completion.factor
# modified: basis/ui/gadgets/editors/editors.factor
# new file: basis/ui/gadgets/labels/labels-tests.factor
# modified: basis/ui/gadgets/scrollers/scrollers.factor
# modified: basis/ui/gadgets/tracks/tracks.factor
# modified: basis/ui/tools/deploy/deploy.factor
# modified: basis/ui/tools/listener/listener.factor
# modified: basis/ui/tools/traceback/traceback.factor
# modified: basis/ui/tools/workspace/workspace.factor
# modified: basis/ui/ui-docs.factor
# modified: basis/unix/bsd/bsd.factor
# modified: basis/unix/unix.factor
# modified: build-support/factor.sh
# modified: core/io/files/files.factor
# modified: core/math/math-docs.factor
# modified: core/parser/parser-tests.factor
# modified: core/parser/parser.factor
# modified: extra/cairo/gadgets/gadgets.factor
# modified: extra/opengl/gadgets/gadgets.factor
# modified: extra/spheres/spheres.factor
# modified: misc/factor.el
# modified: vm/os-netbsd.h
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# unmerged: basis/concurrency/combinators/combinators-docs.factor
# unmerged: basis/values/values-docs.factor
#
New Annotation