diff options
| author | Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> | 2014-05-16 18:42:44 +0200 |
|---|---|---|
| committer | Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> | 2014-05-17 19:18:07 +0200 |
| commit | b84057ad629f4dfc0a94b6a273570a53ba5a9d0a (patch) | |
| tree | 9159244012ff1e727c676ca1b29ab694d700825e /org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java | |
| parent | 2aa2b3af31e95b90c20794c727fc2e48b5f448e9 (diff) | |
| download | jgit-b84057ad629f4dfc0a94b6a273570a53ba5a9d0a.tar.gz jgit-b84057ad629f4dfc0a94b6a273570a53ba5a9d0a.zip | |
Cherry-Pick: Support --mainline to pick merges
By specifying a mainline parent, a merge is cherry picked as if this
parent was its only parent. If no mainline parent is given, cherry
picking merges is not allowed, as before.
Change-Id: I391cb73bf8f49e2df61428c17b40fae8c86a8b76
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
Diffstat (limited to 'org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java')
0 files changed, 0 insertions, 0 deletions