On Fri, Jul 12, 2013 at 3:55 PM, Scott Kostyshak <skost...@lyx.org> wrote: > On Fri, Jul 12, 2013 at 7:08 AM, Kornel Benko <kor...@lyx.org> wrote: >> Am Donnerstag, 11. Juli 2013 um 13:11:18, schrieb Scott Kostyshak >> <skost...@lyx.org> >>
> Yes, something is off. I got the following when doing a git pull: > > Merge branch '2.1-staging' of git.lyx.org:lyx into 2.1-staging > > # Please enter a commit message to explain why this merge is necessary, > # especially if it merges an updated upstream into a topic branch. > # > # Lines starting with '#' will be ignored, and an empty message aborts > # the commit. My fault. Bash history reveals my mistake: I ran "git reset --hard origin/master" where I meant to do "git reset --hard origin/2.1-staging" Scott
