SYNOPSIS

cg-merge [-c] [-b BASE_COMMIT] BRANCH_NAME

DESCRIPTION

Takes a parameter identifying the branch to be merged.

You have to examine the tree after the merge and then do cg-commit.

Alternatively, it will just bring the HEAD forward, if your current HEAD is also the merge base.

OPTIONS

-b BASE_COMMIT

Parameter specifies the base commit for the merge.

-c

Parameter specifies that you want to have tree merge never autocomitted, but want to review and commit it manually.

-h, --help

Print usage help.

COPYRIGHT

Copyright © Petr Baudis, 2005

SEE ALSO

cg-merge command is part of cogito(7), a toolkit for managing git(1) trees.