1CG-UPDATE(1)                                                      CG-UPDATE(1)
2
3
4

NAME

6       cg-update - fetch and merge changes from a remote repository
7

SYNOPSIS

9       cg-update [-f] [--squash] [-v] [BRANCH_NAME]
10
11

DESCRIPTION

13       Takes the branch name as an argument, defaulting to origin.
14
15       This is similar to running cg-fetch and cg-merge commands successively.
16       Please refer to the documentation of those commands for more details
17       about the operation. Note that if you are not doing own development but
18       only following some project, it is recommended to use this command
19       instead of cg-fetch(1) + cg-merge(1) since cg-update(1) can handle some
20       additional corner cases (in particular, if the remote branch rebases,
21       cg-update(1) will fast-forward instead of doing a tree merge and
22       diverging).
23
24       Note that in the GIT newspeak, the operation being performed by
25       cg-update is now called pull, even though in the past, pull was the
26       name for the operation being now done by cg-fetch, which is even still
27       aliased to cg-pull. Please do not let this confuse you. (Cogito won't
28       call this update operation pull, since about everyone but GIT and BK
29       users uses it in the fetch meaning.)
30
31

OPTIONS

33       -f     Force the complete fetch even if the heads are the same.
34
35       --squash
36              "Squash" merge - condense all the to-be-merged commits to a
37              single merge commit. This is not to be used lightly; see the
38              cg-merge documentation for further details.
39
40       -v     Display more verbose output - most notably list all the files
41              touched by the pulled changes.
42
43       -h, --help
44              Print usage summary.
45
46       --long-help
47              Print user manual. The same as found in cg-update(1).
48

ENVIRONMENT

50       CGFETCH_FLAGS
51              Additional flags to pass cg-fetch (useful e.g. for -v -v).
52

54       Copyright © Petr Baudis, 2005
55
56

SEE ALSO

58       cg-update is part of cogito(7), a toolkit for managing git(7) trees.
59
60
61
62
63                                  12/11/2006                      CG-UPDATE(1)
Impressum