diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2017-03-21 19:53:20 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2017-03-21 19:53:20 -0300 |
commit | adc39c77f6111a38da82636f75e1880ac2d49f4f (patch) | |
tree | f3e0c7089ae74b3043e620ab7e5763ac21d3fcb9 | |
parent | 94dc2af490b6edcbdde0e0397d4e81b5d62ba08d (diff) | |
download | apps-adc39c77f6111a38da82636f75e1880ac2d49f4f.tar.gz apps-adc39c77f6111a38da82636f75e1880ac2d49f4f.tar.bz2 |
Docs: deployment and updating
-rw-r--r-- | README.md | 23 | ||||
-rwxr-xr-x | inception | 2 |
2 files changed, 24 insertions, 1 deletions
@@ -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 ---------------- @@ -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 |