SYNOPSIS

cg-COMMAND <arg>…

DESCRIPTION

Cogito is a version control system layered on top of the git tree history storage system. Amongst some of the noteworthy features, Cogito has support for branching, tagging and multiple backends for distributing repositories (local files, rsync, HTTP, ssh).

Cogito is implemented as a series of bash(1) scripts on top of git(7) (a content-tracking filesystem) with the goal of providing an interface for working with the GIT database in a manner similar to other SCM tools (like CVS, BitKeeper or Monotone).

Commands Overview

The Cogito commands can be split into regular commands and advanced commands. The regular commands are those used for normal interacting with the repository, while the advanced commands can be used for administrating the repository and should to some degree be regarded as low-level and in some cases dangerous.

Below an overview of the available commands are listed. For details on individual commands, do e.g.

cg-help cg-log

or

cg-log --long-help

You can find the quick overview of the most useful commands and concepts in cg-ref(7).

Regular commands

cg-add [-N] [-r] FILE…

Add files to the GIT repository.

cg-branch-add BRANCH_NAME LOCATION

Add new remote branch to the GIT repository.

cg-branch-chg BRANCH_NAME NEW_LOCATION

Change the remote branch repository URL.

cg-branch-ls

List configured remote branches.

cg-clean [-d] [-D] [-n] [-q] [-x]

Clean unknown files from the working tree.

cg-clone [-l] [-s] LOCATION [DESTDIR]

Clone a remote GIT repository.

cg-commit [-m MESSAGE]… [-e] [-c COMMIT_ID] [OTHER_OPTIONS] [FILE]… [< MESSAGE]

Commit into a GIT repository.

cg-diff [-c] [-m] [-s] [-p] [-r FROM_ID[..TO_ID]] [FILE]…

Make a diff between two GIT trees.

cg-export [-r TREE_ID] DESTFILE

Export a particular revision from a GIT repository.

cg-fetch [-f] [-v] [BRANCH_NAME]

Fetch changes from a remote branch to the local GIT repository.

cg-help [-c] [cg-COMMAND | COMMAND]

Show help for Cogito commands.

cg-init [-I] [-N] [-e EXCLUDEPATTERN]… [-m MESSAGE]…

Initialize a GIT repository.

cg-log [-D DATE] [-r FROM_ID[..TO_ID]] [-s] [--summary] [OTHER_OPTIONS] FILE…

Make a log of changes in a GIT branch.

cg-merge [-c] [-b BASE_COMMIT] [-j] [--squash] [-v] [BRANCH_NAME]

Merge a branch to the current tree.

cg-mkpatch [-m] [-s] [-r FROM_ID[..TO_ID] [-d DIRNAME]]

Make a patch from one or several commits.

cg-mv [-f] FILE… DEST

Rename or move files in a GIT repository.

cg-object-id [-c | -d | -n | -p | -t] [OBJECT_ID]

Get SHA1 ID of commit or tree associated with given ID or HEAD.

cg-patch [-c] [-C COMMIT] [-pN] [-R] [-u] [OTHER_OPTIONS] < PATCH

Apply a patch from a file, input, or a commit.

cg-push [-r LOCAL_BRANCH] [REMOTE_BRANCH] [-t TAG]…

Push changes to a remote GIT repository.

cg-reset [--adds-removes]

Reset the state of the working tree.

cg-restore [-f] [-r ID] [FILE]…

Restore files in the working tree to state at the given/last commit.

cg-rm [-f] [-n] [-r] FILE…

Remove files from a GIT repository.

cg-seek [COMMIT_ID]

Seek the working tree to a given commit.

cg-status [-g] [[-n] -s STATUS] [-w] [-x] [DIRPATH]

Show status of your working tree.

cg-switch [-f] [-n] [-r COMMIT_ID] BRANCH

Switch your current local branch.

cg-tag [-d DESCRIPTION] [-s [-k KEYNAME]] TAG_NAME [OBJECT_ID]

Mark certain commit by a tag.

cg-tag-ls

List stored GIT tags.

cg-update [-f] [--squash] [-v] [BRANCH_NAME]

Pull and merge changes from a remote branch to the local repository.

cg-version

Show the version of the Cogito toolkit.

cg-version.in

Show the version of the Cogito toolkit.

Advanced commands

cg-admin-cat [-r TREE_ID] FILE…

Cat a file(s) by filename from a GIT repository.

cg-admin-ls [-t TREE_ID] [PATH]

List contents of a particular tree in a GIT repository.

cg-admin-lsobj [OBJECT_TYPE]

List objects of the GIT repository.

cg-admin-rewritehist [-d TEMPDIR] [-r STARTREV]… [-k KEEPREV]… [FILTERS] DESTBRANCH

Rewrite GIT revision history.

cg-admin-setuprepo [-g GROUP] DIRECTORY

Setup a public GIT repository.

cg-admin-uncommit [-t] [COMMIT_ID]

Undo a commit or a series of commits.

Helper commands

There are a few helper commands that are not meant to be used from the command line. They provide a library of generic functions used by many of the real Cogito commands. You can safely ignore them, unless you want to contribute to Cogito development.

cg-Xfetchprogress

Show a cute progressbar for cg-fetch.

cg-Xlib

Common code shared by the Cogito toolkit.

cg-Xmergefile

Merge two revisions of a file.

Command Identifiers

BRANCH_NAME

Indicates a branch name added with the cg-branch-add(1) or cg-switch(1) commands.

COMMAND

Indicates a Cogito command. The cg- prefix is optional.

LOCATION

Indicates a local file path or a URI. See cg-branch-add(1) for a list of supported URI schemes.

COMMIT_ID, FROM_ID, TO_ID, BASE_COMMIT

Indicates an ID resolving to a commit. The following expressions can be used interchangeably as IDs:

  • empty string, this or HEAD (current HEAD)

  • branch name (as registered with cg-branch-add(1))

  • tag name (as registered with cg-tag(1))

  • date string (as recognized by the date tool)

  • shortcut object hash (shorted unambiguous hash lead)

  • commit object hash (as returned by cg-object-id -c)

  • tree object hash (as returned by cg-object-id -t)

TAG_NAME

Indicates a free form tag name.

OBJECT_TYPE

Indicates a git object type i.e.: blob, commit, tree or tag.

USERNAME

Indicates a free form user name.

FILE

Indicates an already existing filename - always relative to the root of the repository.

FILES

~/.cgrc

This file is read on startup if stdout is a terminal and may contain information about default command line options. Each line consists of a command name and a list of options. Lines not starting with a Cogito command name are ignored. To have cg-log and cg-diff colorize the output put the following in ~/.cgrc:

log -c
diff -c
You can prevent Cogito from reading ~/.cgrc by setting the
CG_NORC environment variable.

COPYRIGHT

Copyright © Petr Baudis, 2005.

SEE ALSO

Cogito is based on git(7). A quick Cogito reference sheet is in cg-ref(7).