summaryrefslogtreecommitdiff
path: root/tests.branching/ambiguous-refs.script
Commit message (Collapse)AuthorAgeFilesLines
* Fix spelling mistakesSam Thursfield2012-11-121-1/+1
|
* Use origin/ref for all refs other than the system branch ref itselfSam Thursfield2012-10-031-0/+49
The rationale here is that inside a checkout of a system branch, the user should only be committing to the refs for that system branch, because those are the only ones that 'morph merge' will look at. This removes a problem where we could be confused by a ref with a name that would be sorted before 'master' in the result of 'git show-ref'.