diff options
2 files changed, 13 insertions, 0 deletions
diff --git a/doc/todo/automatic_merge_of_synced_branches_upon___34__git_annex_sync__34__.mdwn b/doc/todo/automatic_merge_of_synced_branches_upon___34__git_annex_sync__34__.mdwn index 361585a78..b1adfdcc2 100644 --- a/doc/todo/automatic_merge_of_synced_branches_upon___34__git_annex_sync__34__.mdwn +++ b/doc/todo/automatic_merge_of_synced_branches_upon___34__git_annex_sync__34__.mdwn @@ -14,3 +14,5 @@ As just discussed on IRC (#vcs-home/OFTC), this could be implemented in various Thanks for git-annex! + +> [[done]]; use new git feature instead. --[[Joey]] diff --git a/doc/todo/automatic_merge_of_synced_branches_upon___34__git_annex_sync__34__/comment_1_60e5067c2be9e8df7bd1b6d954c60cad._comment b/doc/todo/automatic_merge_of_synced_branches_upon___34__git_annex_sync__34__/comment_1_60e5067c2be9e8df7bd1b6d954c60cad._comment new file mode 100644 index 000000000..4b0ea8e1c --- /dev/null +++ b/doc/todo/automatic_merge_of_synced_branches_upon___34__git_annex_sync__34__/comment_1_60e5067c2be9e8df7bd1b6d954c60cad._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2015-07-07T19:54:07Z" + content=""" +Git recently got receive.denyCurrentBranch=updateInstead, +which allows the remote working tree to be updated automatically +(as long as there are no changes in the work tree or staged in the index). + +This seems much better than putting a hack into git-annex. +"""]] |