aboutsummaryrefslogtreecommitdiff
path: root/doc/direct_mode
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-07 14:43:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-07 14:43:34 -0400
commit36148bb230b40eb601a9be348cc19a8eab77507b (patch)
tree247099733ad871d847f5dcae9387148c3bd4c385 /doc/direct_mode
parent8074d144968a29b8ad0f149c8f4265ea57080453 (diff)
remove some old comments about safety of git working tree commands in direct mode
Diffstat (limited to 'doc/direct_mode')
-rw-r--r--doc/direct_mode/comment_10_94284a476604e9c812b7ee475ca22959._comment12
-rw-r--r--doc/direct_mode/comment_1_93fc31e8dc0ad16248a2593a1482d375._comment8
-rw-r--r--doc/direct_mode/comment_2_7f7086b34ed136851963f145868a1d23._comment12
-rw-r--r--doc/direct_mode/comment_4_97c26bd82f623a3b2d56bab4afff0126._comment1
-rw-r--r--doc/direct_mode/comment_9_cff56dbcdfec60375c30d5b1b1c60614._comment12
5 files changed, 0 insertions, 45 deletions
diff --git a/doc/direct_mode/comment_10_94284a476604e9c812b7ee475ca22959._comment b/doc/direct_mode/comment_10_94284a476604e9c812b7ee475ca22959._comment
deleted file mode 100644
index e14f56485..000000000
--- a/doc/direct_mode/comment_10_94284a476604e9c812b7ee475ca22959._comment
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!comment format=mdwn
- username="http://olivier.berger.myopenid.com/"
- nickname="obergix"
- subject="How to sync changes made in another remote when in direct mode"
- date="2013-08-17T21:53:57Z"
- content="""
-Re-reading @joey's reponse above, I see that merge/pull don't seem to be safe and will create dangling symlinks. That corresponds to those files I can see on cifs, I guess.
-
-But then, how can a direct repo sync with changes made in other remotes, if there no pull/fetch available.
-
-Can it then be only the source of changes which will propagate to indirect remotes ?
-"""]]
diff --git a/doc/direct_mode/comment_1_93fc31e8dc0ad16248a2593a1482d375._comment b/doc/direct_mode/comment_1_93fc31e8dc0ad16248a2593a1482d375._comment
deleted file mode 100644
index 8de8cf9af..000000000
--- a/doc/direct_mode/comment_1_93fc31e8dc0ad16248a2593a1482d375._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawl2Jj8q2upJL4ZQAc2lp7ugTxJiGtcICv8"
- nickname="Michael"
- subject="comment 1"
- date="2013-02-18T23:24:11Z"
- content="""
-So, just which git commands *are* safe? It seems like I'm going to have to use direct mode, so it'd be nice to know just what I'm allowed to do, and what the workflow should be.
-"""]]
diff --git a/doc/direct_mode/comment_2_7f7086b34ed136851963f145868a1d23._comment b/doc/direct_mode/comment_2_7f7086b34ed136851963f145868a1d23._comment
deleted file mode 100644
index ddabee7e3..000000000
--- a/doc/direct_mode/comment_2_7f7086b34ed136851963f145868a1d23._comment
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.152.108.183"
- subject="safe and unsafe commands"
- date="2013-02-19T02:55:13Z"
- content="""
-All git commands that do not change files in the work tee (and do not stage files from the work tree), are safe. I don't have a complete list; it includes `git log`, `git show`, `git diff`, `git commit` (but not -a or with a file as a parameter), `git branch`, `git fetch`, `git push`, `git grep`, `git status`, `git tag`, `git mv` (this one is somewhat surprising, but I've tested it and it's ok)
-
-git commands that change files in the work tree will replace your data with dangling symlinks. This includes things like `git revert`, `git checkout`, `git merge`, `git pull`, `git reset`
-
-git commands that stage files from the work tree will commit your data to git directly. This includes `git add`, `git commit -a`, and `git commit file`
-"""]]
diff --git a/doc/direct_mode/comment_4_97c26bd82f623a3b2d56bab4afff0126._comment b/doc/direct_mode/comment_4_97c26bd82f623a3b2d56bab4afff0126._comment
index 180018399..cf5ae2fb6 100644
--- a/doc/direct_mode/comment_4_97c26bd82f623a3b2d56bab4afff0126._comment
+++ b/doc/direct_mode/comment_4_97c26bd82f623a3b2d56bab4afff0126._comment
@@ -6,7 +6,6 @@
content="""
<pre>
git annex add $file
-git commit -m changed
git annex sync
git annex copy $file --to otherrepo
</pre>
diff --git a/doc/direct_mode/comment_9_cff56dbcdfec60375c30d5b1b1c60614._comment b/doc/direct_mode/comment_9_cff56dbcdfec60375c30d5b1b1c60614._comment
deleted file mode 100644
index d2c752a54..000000000
--- a/doc/direct_mode/comment_9_cff56dbcdfec60375c30d5b1b1c60614._comment
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!comment format=mdwn
- username="http://olivier.berger.myopenid.com/"
- nickname="obergix"
- subject="Mixing indirect mode and direct mode on different remotes"
- date="2013-08-17T20:35:40Z"
- content="""
-I'd like to have an indirect mode repo on my laptop cloned on a cifs mount point (mounted off an SMB NAS) thus in direct mode. But all I can see on the clone after merge/pull is text files of length 207 chars containg the symlink in plain text.
-
-I guess this is what git manages internally for the symlinks... so I'm afraid git annex doesn't work in such case.
-
-Can you confirm that indirect and direct modes can coexist on clones of the same repo ?
-"""]]