[coreboot-gerrit] Patch merged into coreboot/master: util/gitconfig: add cborg2cros.py script

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 34e4a1c01a0082d50a789a3fdf4847dd33d4d114
Author: Martin Roth <martinroth at google.com>
Date:   Wed Aug 3 22:50:46 2016 -0600

    util/gitconfig: add cborg2cros.py script
    
    This is a python script that does basically the same thing as the
    rebase.sh script, but in the other direction.  rebase.sh takes files
    from the chromium tree (cros) and pulls them to the coreboot.org tree.
    cborg2cros, as the name implies, updates patches to go into the cros
    tree from coreboot.
    
    It adds the 'UPSTREAM: ' identifier to the start of the commit message,
    and uses the text '(cherry-picked from commit #####)' instead of
    'Original-Commit-Id: #####'
    
    It also adds the 'TEST=', 'BRANCH=', and 'BUG=' lines if they aren't
    there.
    
    Change-Id: Ibad9a5f0d0d2c713cf08e103c463e2e82768c436
    Signed-off-by: Martin Roth <martinroth at google.com>
    Reviewed-on: https://review.coreboot.org/15323
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer <stefan.reinauer at coreboot.org>


See https://review.coreboot.org/15323 for details.

-gerrit