Timothy Wall
14 linhas
469 B
Plaintext
14 linhas
469 B
Plaintext
--- libffi notes ---
|
|
The libffi subdirectory is managed as a subtree. Use subtree merging
|
|
to update from upstream, e.g.
|
|
|
|
$ git pull -s subtree libffi master (or other branch, if necessary)
|
|
|
|
The libffi subdirectory was originally mapped as follows:
|
|
|
|
$ git remote add -f libffi git@github.com:atgreen/libffi.git
|
|
$ git merge -s ours --no-commit libffi/master
|
|
$ git read-tree --prefix=native/libffi -u libffi/master
|
|
$ git commit -m "Merge libffi as subtree"
|
|
|