diff options
| author | Maximiliano Curia <maxy@gnuservers.com.ar> | 2019-07-20 21:59:10 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2019-07-21 10:10:49 +0200 |
| commit | 8afb7ee72ac66c97c12b97c0ae70fbc2adf4c15e (patch) | |
| tree | c2e0b7a25f2e7d32a7351d8964845963c27fd321 /.travis.yml | |
| parent | d1960b3dc0dfbb6be2183e555e615864468b234c (diff) | |
import-orig/merge_replace Avoid calling force_head
The debian_merge_by_replace function ends up calling force_head, but up
to this point the current branch could be anything, and thus when called from a
feature branch the latest commits get lost.
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions