rebase.txt

D:\Sandbox\GitHub\OpenGraphMeta [dw_dev ≡]> git rebase upstream/REL1_27
First, rewinding head to replay your work on top of it...
Applying: Hotpatch fixes adapted from DoomWiki live copy
Applying: PageImages integration (experimental)
Applying: Add self to authors for extension credits
Applying: Hook function needs to return true
Applying: Special handling for NS_FILE
Applying: MIME blacklist capability
D:\Sandbox\GitHub\OpenGraphMeta [dw_dev ↕]> git status
On branch dw_dev
Your branch and 'origin/dw_dev' have diverged,
and have 9 and 6 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
D:\Sandbox\GitHub\OpenGraphMeta [dw_dev ↕]>