summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-05 12:59:53 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-05 12:59:53 -0400
commit64226ac38341f6edd255c4a920307982f01a08db (patch)
treecc94640404c5fb4230f1e6ceea47a30a57131ffc /doc
parent6996dfcb3d7b4225e4a81f7005b127a0bad694a6 (diff)
response
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/Multisession_compatible__63__/comment_2_c1dc4294cc2a43cfecfb7279d6411924._comment21
1 files changed, 21 insertions, 0 deletions
diff --git a/doc/forum/Multisession_compatible__63__/comment_2_c1dc4294cc2a43cfecfb7279d6411924._comment b/doc/forum/Multisession_compatible__63__/comment_2_c1dc4294cc2a43cfecfb7279d6411924._comment
new file mode 100644
index 000000000..0d4c1505f
--- /dev/null
+++ b/doc/forum/Multisession_compatible__63__/comment_2_c1dc4294cc2a43cfecfb7279d6411924._comment
@@ -0,0 +1,21 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2016-02-05T16:37:48Z"
+ content="""
+Well obviously if you have the git-annex branch checked out, any operation
+involving the work tree is not going to operate on the usual work tree.
+So obviously `git add` and `git annex add` are not going to do what you
+want them to do (unless you want them to add files to the checked-out
+git-annex branch). I'm not sure what other problems you might run into
+doing that.
+
+git-annex uses the .git/annex/index file to stage commits to the git-annex
+branch. Using that index file might help with rebasing or other operations
+on the branch.
+
+It's certianly
+theoretically possible to rebase without touching the work tree and only
+using such an index file, but I don't know if git's rebase works that way.
+I also don't see any particular benefit to rebasing the git-annex branch.
+"""]]