A
|
B  H
|  |
C  G
|  |
D  F
| /
E

H
|
G
|
F
|
X
|
B
|
C
|
D
|
E

git fetch origin/master
git rebase origin/master --preserve-merges

git config pull.rebase preserve

git pull --rebase=preserve