diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/bugs/Can__39__t_set_repositories_directory.mdwn | 3 | ||||
-rw-r--r-- | doc/bugs/gpg_error_on_android.mdwn | 3 | ||||
-rw-r--r-- | doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn | 2 | ||||
-rw-r--r-- | doc/walkthrough.mdwn | 1 | ||||
-rw-r--r-- | doc/walkthrough/syncing.mdwn | 4 | ||||
-rw-r--r-- | doc/walkthrough/using_tags_and_branches.mdwn | 14 |
6 files changed, 27 insertions, 0 deletions
diff --git a/doc/bugs/Can__39__t_set_repositories_directory.mdwn b/doc/bugs/Can__39__t_set_repositories_directory.mdwn index bbc5bd638..f1ce5dea5 100644 --- a/doc/bugs/Can__39__t_set_repositories_directory.mdwn +++ b/doc/bugs/Can__39__t_set_repositories_directory.mdwn @@ -10,3 +10,6 @@ At beginning during the webapp installation user error (git ["--git-dir=/Users/filippo/Desktop/annex/.git","--work-tree=/Users/filippo/Desktop/annex","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] exited 128) [[!tag moreinfo assistant]] + +> [[done]]; based on the comment, this was a broken git email issue, which +> git-annex now works around. --[[Joey]] diff --git a/doc/bugs/gpg_error_on_android.mdwn b/doc/bugs/gpg_error_on_android.mdwn index 42f083015..3e69f05f2 100644 --- a/doc/bugs/gpg_error_on_android.mdwn +++ b/doc/bugs/gpg_error_on_android.mdwn @@ -34,3 +34,6 @@ gpg: decryption failed: secret key not available # End of transcript or log. """]] + +> [[done]]; I have deployed the new gpg build for Android and the +> nightly Android app build is now using it. --[[Joey]] diff --git a/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn b/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn index 1bcd37369..471c91e9d 100644 --- a/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn +++ b/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn @@ -58,3 +58,5 @@ rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender= # End of transcript or log. """]] + +[[!tag done]] diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn index c288b71de..e4e3c2222 100644 --- a/doc/walkthrough.mdwn +++ b/doc/walkthrough.mdwn @@ -15,6 +15,7 @@ A walkthrough of the basic features of git-annex. walkthrough/modifying_annexed_files walkthrough/using_ssh_remotes walkthrough/moving_file_content_between_repositories + walkthough/using_tags_and_branches walkthrough/unused_data walkthrough/fsck:_verifying_your_data walkthrough/fsck:_when_things_go_wrong diff --git a/doc/walkthrough/syncing.mdwn b/doc/walkthrough/syncing.mdwn index 38f0f8acc..3c43e502c 100644 --- a/doc/walkthrough/syncing.mdwn +++ b/doc/walkthrough/syncing.mdwn @@ -23,3 +23,7 @@ remotes, where a sync will get them. This is especially useful when using git in a distributed fashion, without a [[central bare repository|tips/centralized_git_repository_tutorial]]. See [[sync]] for details. + +Note that syncing only syncs the metadata about your files that is stored +in git. It does not sync the contents of files, that are managed by +git-annex. diff --git a/doc/walkthrough/using_tags_and_branches.mdwn b/doc/walkthrough/using_tags_and_branches.mdwn new file mode 100644 index 000000000..06f021472 --- /dev/null +++ b/doc/walkthrough/using_tags_and_branches.mdwn @@ -0,0 +1,14 @@ +Like git, git-annex hangs on to every old version of a file, so you can +make tags and branches, and can check them out later to look at the old +files. + + # git tag 1.0 + # rm -f my_cool_big_file + # git commit -m deleted + # git checkout 1.0 + # cat my_cool_big_file + yay! old version still here + +Of course, when you `git checkout` an old branch, some old versions of +files may not be locally available, and may be stored in some other +repository. You can use `git annex get` to get them as usual. |