X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=README;h=dec299f009892922b13c8f199fd53a12a678603e;hp=dcb7e805412d361def75c54e56f31f465bfbca58;hb=8d92943bcdb6eea3819dce28d2ff48dd8a061b31;hpb=53583f1e08ce7612e14dfc44c4dcc283902ff85b

diff --git a/README b/README
index dcb7e80..dec299f 100644
--- a/README
+++ b/README
@@ -358,6 +358,10 @@ tg summary
 	order.  In more complex scenarios, a text graph view would be
 	much more useful, but that is not yet implemented.
 
+	The --deps option outputs dependency informations between
+	branches in a machine-readable format.  Feed this to "tsort"
+	to get the output from --sort.
+
 	TODO: Speed up by an order of magnitude
 	TODO: Text graph view
 
@@ -479,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.
 
@@ -504,6 +510,21 @@ tg push
 	repository.  By default the remote gets all dependencies
 	(both tgish and non-tgish) and bases pushed to.
 
+tg base
+~~~~~~~
+	Prints the base commit of the current topic branch.  Silently
+	exits with exit code 1 if you are not working on a TopGit
+	branch.  The following command can be useful to get a summary
+	of the work you have made on a topic branch:
+
+		git log --first-parent --no-merges `tg base`..
+
+	(Note: if you have shared the TopGit branch, the above command
+	only lists the commits that were made in the current
+	repository, so you will not see work done by your
+	collaborators.)
+
+
 TODO: tg rename
 
 
@@ -603,3 +624,13 @@ All commands by default refer to the remote that 'tg remote --populate'
 was called on the last time ('topgit.remote' configuration variable). You can
 manually run any command with a different base remote by passing '-r REMOTE'
 _before_ the subcommand name.
+
+
+POINTERS
+--------
+
+The following references are useful to understand the development of topgit and
+its subcommands.
+
+tg depend:
+  http://lists-archives.org/git/688698-add-list-and-rm-sub-commands-to-tg-depend.html