mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

close; use receive.denyCurrentBranch=updateInstead

Browse source
This commit is contained in:
Joey Hess 2015-07-07 16:00:25 -04:00
parent 60fc25e9d3
commit 772dd88ae9
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/todo/automatic_merge_of_synced_branches_upon___34__git_annex_sync__34__.mdwn
View file

@ -14,3 +14,5 @@ As just discussed on IRC (#vcs-home/OFTC), this could be implemented in various
Thanks for git-annex! Thanks for git-annex!
> [[done]]; use new git feature instead. --[[Joey]]

11
doc/todo/automatic_merge_of_synced_branches_upon___34__git_annex_sync__34__/comment_1_60e5067c2be9e8df7bd1b6d954c60cad._comment Normal file
View file

@ -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.
"""]]