Screwed up branch with duplicate commits prevents rebasing.

gistfile1.txt

This is the prompt when I do 'git rebase -i origin/master' :

pick f40ea97 DMARC, compile & link, init and close functions
pick aa12df5 DMARC, add sender ip to policy context
pick 58ee026 DMARC, add From header domain to policy context
pick df2c02b DMARC, add dkim results to policy context
pick dfaab2c DMARC, add spf results to policy context
pick d25a0db DMARC, add logging and error checking
pick e397f2d DMARC, bugfix: reorder function calls
pick 038bea2 DMARC, load TLD list
pick bb96514 DMARC, config option for TLD list
pick b0fc225 DMARC, bugfix, TLD list
pick fb78faa DMARC, reorder, TLD list
pick 97f41be DMARC, cleanup init code
pick 43511ef DMARC, bugfix, handle missing From: header
pick 0892405 DMARC, typo in declaration
pick a2b3503 DMARC, typo 2 in declaration
pick e13a1ff DMARC, convert to modular layout
pick 27fb3a6 DMARC, add some expansion variables.
pick 6f9042a DMARC, add control=dmarc_disable_verify
pick 680d1ab DMARC, add dmarc_status condition
pick fdde184 DMARC, Authentication-Results header expansion variable
pick f5bbc24 DMARC, documentation
pick 5f689a2 DMARC, clear some variables on reuse
pick 99b18d9 DMARC, adjust location of dmarc processing.
pick 2e85ce1 DMARC, no DKIM control also blocks DMARC
pick 76e5003 DMARC, better sender From domain extraction
pick 2c32a76 DMARC, expansion needed more slashes
pick db92aa8 DMARC, documentation cleanup
pick d9fbf8d DMARC, check for empty strings
pick 40367a0 DMARC, use normal functions, do not "fix" it

# Notice how it starts over here?  The last 12 commits above do not appear below.

pick 3f037db DMARC, compile & link, init and close functions
pick 23c214a DMARC, add sender ip to policy context
pick 21c1b30 DMARC, add From header domain to policy context
pick 79352b8 DMARC, add dkim results to policy context
pick 42f925b DMARC, add spf results to policy context
pick babf431 Add cscope ignores
pick 4f46e0e DMARC, add logging and error checking
pick fefdc14 DMARC, bugfix: reorder function calls
pick 920ea15 DMARC, load TLD list
pick 3e912e1 DMARC, config option for TLD list
pick 9b1ab89 DMARC, bugfix, TLD list
pick 7efb0b0 DMARC, reorder, TLD list
pick 7c53cad DMARC, cleanup init code
pick 734c69d DMARC, bugfix, handle missing From: header
pick d832fab DMARC, typo in declaration
pick f166d1a DMARC, typo 2 in declaration
pick 533c943 DMARC, convert to modular layout
pick d0d5fed DMARC, add some expansion variables.

# And then it starts over *again*

pick c41c0f1 DMARC, compile & link, init and close functions
pick 7883334 DMARC, add sender ip to policy context
pick 6100bef DMARC, add From header domain to policy context
pick bc03288 DMARC, add dkim results to policy context
pick 907766f DMARC, add spf results to policy context
pick 2662c18 Add cscope ignores
pick b080374 DMARC, add logging and error checking
pick c41712d DMARC, bugfix: reorder function calls
pick 59c0b9b DMARC, load TLD list
pick e5a3bd4 DMARC, config option for TLD list
pick fca0f1b DMARC, bugfix, TLD list
pick 923eb38 DMARC, reorder, TLD list
pick 1843534 DMARC, cleanup init code
pick 1d5d1bb DMARC, bugfix, handle missing From: header
pick afc14c8 DMARC, typo in declaration
pick 1ff4e1b DMARC, typo 2 in declaration
pick 88dab91 Unbreak non-ipv6 build.
pick 15e763f DMARC, merge missed one piece
pick 3668fba DMARC, add control=dmarc_disable_verify
pick 9e26a6c DMARC, add dmarc_status condition
pick f1df2a6 DMARC, Authentication-Results header expansion variable
pick facf6fd DMARC, documentation
pick c78aaa0 DMARC, clear some variables on reuse
pick 7377fdb First attempt to logging statistics for opendmarc
pick 43df121 Convert horrible logic to switch.
pick d29feca Document two config parameters for dmarc
pick 16dd04e Refactor code that generates/writes history data
pick c6fcb71 Forensic report function
pick 84f8498 Makefile generation like other EXPERIMENTAL objs
pick dc7c1a1 Add opendmarc license requirements
pick 226e9eb Initial work to send forensic reports
pick c2a5147 Bugfix: swapped spf/dkim align statistics logging
pick c623e11 Send Forensic DMARC Reports
pick d182efe Reverse forensic report logic.
pick 9c2b972 Fix memory leak in Forensic Report generation
pick 182767a Function to use fakens data in test harness
pick fa39434 Clear out tail of TXT record in test harness
pick 562c42b Remove fakedns