summaryrefslogtreecommitdiffstats
path: root/docs/development
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-13 00:21:03 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-13 00:29:08 +0200
commita38deb88ed5fc0dc7e94404ef522898cb5741fb6 (patch)
tree27633d3de8d95c35da6961680ba9dc277de3b9a3 /docs/development
parentde0b0f160f6ac408c2ba302507ede4d0a537b73f (diff)
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/development')
0 files changed, 0 insertions, 0 deletions