Docs: deployment and updating

diff --git a/README.md b/README.md
index 288eaa716e3029743495b2af3f1dbb4b9a24e412..decf499c1e27fe6779bbb8a4dbcf1d7d7d9b6d23 100644 (file)
--- a/README.md
+++ b/README.md
@@ -44,6 +44,29 @@ rsync+ssh:
 
     inception deploy <hostname>
 
+This commands uses rsync to send all contents of your `$HOME/apps` and
+`$HOME/.dotfiles` to a remote server, so please do not add personal or
+sensitive stuff in those places. Then it makes sure your dotfiles are properly
+linked.
+
+Updating
+--------
+
+You can fetch updates in this repository using
+
+    inception fetch
+
+This commands don't automatically update your working copy. Instead, it just
+does a git fetch in the `remotes/origin` repository and display it's last
+commit log including git signature.
+
+You can check version differences using `inception version` and also standard
+git commands such as `git-log(1)`. Once you're satisfied and want to apply
+changes to the current working copy including updating and initializing
+submodules, type
+
+    inception merge
+
 Folder structure
 ----------------
 

diff --git a/inception b/inception
index 0ef057768c4d33957f545abe666df00f5ec6097b..8ee6dde63a960d2e2fb7274e463f7d33596d9e04 100755 (executable)
--- a/inception
+++ b/inception
@@ -129,7 +129,7 @@ function inception_version {
 
 # Fetch
 function inception_fetch {
-  ( cd $DIRNAME && $GIT fetch --all && $GIT log -n 1 --branches=origin/master )
+  ( cd $DIRNAME && $GIT fetch --all && $GIT log --show-signature -n 1 --branches=origin/master )
 }
 
 # Merge