X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=README;h=dec299f009892922b13c8f199fd53a12a678603e;hp=9bab4defb385acc3a377750414de8167558c613e;hb=8d92943bcdb6eea3819dce28d2ff48dd8a061b31;hpb=f7a99e125ea7ffffe284e1fa2026b8531d99041a diff --git a/README b/README index 9bab4de..dec299f 100644 --- a/README +++ b/README @@ -483,13 +483,15 @@ tg import tg update ~~~~~~~~~ - Update the current topic branch wrt. changes in the branches - it depends on and remote branches. + Update the current or specified topic branch wrt. changes in the + branches it depends on and remote branches. This is performed in two phases - first, changes within the dependencies are merged to the base, then the base is merged into the topic branch. The output will guide you in case of conflicts. + After the update the current branch is the specified one. + In case your dependencies are not up-to-date, tg update will first recurse into them and update these.