diff options
author | 2017-07-13 00:21:03 +0200 | |
---|---|---|
committer | 2017-07-12 22:30:19 +0000 | |
commit | 3b291dc48f526df8fc85c3a54a6a4bc9f0094f38 (patch) | |
tree | fdf4e53a55d5371353562700bca1dc34d89cbf1b /docs/conf.py | |
parent | 92e3149967feea3adb3351a7e646b0e36b1d76b4 (diff) |
Update git submodules
* Update docs/submodules/armband from branch 'master'
- p/fuel: Rebase, drop --depth=1 when cloning Fuel
`git clone --depth=1` does not preserve git history, so 3-way merge
is not possible.
There are 2 ways to fix this:
- (recurrent) rebase patches by adjusting patch context;
- (one-time, with a recurrent very small performance hit) preserve git
history when cloning Fuel@OPNFV in salt.sh;
So, let's drop "--depth=1" and ensure `git am -3` will continue to work
on future patch context changes (where possbile).
While we're at it, also rebase our current patches.
Change-Id: Iacfb4daf90a170174405410ff9c988c4fcac79ca
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions