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

sync: Work even when the local git repository is new and empty, with no master branch.

Browse source
This commit is contained in:
Joey Hess 2013-11-02 15:29:38 -04:00
parent 43c47b6dbb
commit bc18cde325
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Merge.hs
View file

@ -34,6 +34,5 @@ mergeBranch = do
mergeSynced :: CommandStart
mergeSynced = do
branch <- inRepo Git.Branch.current
prepMerge
maybe stop mergeLocal branch
mergeLocal =<< inRepo Git.Branch.current