diff options
author | Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> | 2014-05-23 23:09:17 +0200 |
---|---|---|
committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-07-15 19:08:19 -0400 |
commit | 48544e27ae3808807dc1960083d8e42c05e62af3 (patch) | |
tree | 2e4119206f9776748091aaa6d49a9698acd7133d /org.eclipse.jgit.pgm.test | |
parent | e0fbae5dc3fc2345383ec373b384fcca10e64f24 (diff) | |
download | jgit-48544e27ae3808807dc1960083d8e42c05e62af3.tar.gz jgit-48544e27ae3808807dc1960083d8e42c05e62af3.zip |
Preserve merges during pull if configured to do so
Setting branch.<name>.rebase or pull.rebase to 'preserve' will preserve
merges during rebase. Also, pull.rebase is now consulted if there is no
branch-specific configuration.
Bug: 429664
Change-Id: I345fa295c7e774e0d0a8e6aba30fbfc3552e0084
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
0 files changed, 0 insertions, 0 deletions