commit | 2f808cae22b72aab029623efad3d9a71440ac6a1 | [log] [tgz] |
---|---|---|
author | Yicheng Li <yichengli@chromium.org> | Mon Jun 29 22:46:03 2020 |
committer | Commit Bot <commit-bot@chromium.org> | Tue Jun 30 16:37:38 2020 |
tree | 64ddc93776d2e8ce9987bcce636e68a05565c96f | |
parent | 50b7da853146eefb17ada6047865f22a4af53bc6 [diff] |
cbor: Update README for new merge instructions Now that we have a cros/upstream/master branch that tracks upstream, merging the upstream is much easier. BUG=none TEST=none Change-Id: Ib53f5114f7aa42bf6b94898ab18d1619752c0547 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/2145016 Tested-by: Yicheng Li <yichengli@chromium.org> Auto-Submit: Yicheng Li <yichengli@chromium.org> Reviewed-by: Tom Hughes <tomhughes@chromium.org> Commit-Queue: Yicheng Li <yichengli@chromium.org>
cbor
: Concise Binary Object RepresentationThis library is a partial implementation of the RFC 7049 Concise Binary Object Representation standard.
The source code was fetched from chromium/src
(https://chromium.googlesource.com/chromium/src/+/242df8b64d2a0ab5f057d1d4c76ea8537fdbb789) in order to avoid code duplication.
The cros/upstream/master branch is a mirror of the components/cbor directory from upstream. It is automatically updated to reflect the latest changes in upstream.
To pull in updates from chromium/src
, do the following:
git checkout -b upstream cros/upstream/master
git checkout master
git merge --allow-unrelated-histories upstream