aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md23
-rwxr-xr-xinception2
2 files changed, 24 insertions, 1 deletions
diff --git a/README.md b/README.md
index 288eaa7..decf499 100644
--- 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 0ef0577..8ee6dde 100755
--- 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