make the merger merge any equivilant sync branch into the current branch
Not just synced/master, but synced/UUID/master, for example
This commit is contained in:
parent
601ee470af
commit
6cddda4143
2 changed files with 30 additions and 14 deletions
|
@ -26,7 +26,6 @@ base = Ref . remove "refs/heads/" . remove "refs/remotes/" . show
|
|||
| prefix `isPrefixOf` s = drop (length prefix) s
|
||||
| otherwise = s
|
||||
|
||||
|
||||
{- Given a directory such as "refs/remotes/origin", and a ref such as
|
||||
- refs/heads/master, yields a version of that ref under the directory,
|
||||
- such as refs/remotes/origin/master. -}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue