diff options
| author | Mathias Kinzler <mathias.kinzler@sap.com> | 2010-10-19 08:54:28 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-10-28 09:18:02 -0700 |
| commit | 7668a462829b12e4f6a192c43157152ef63ff305 (patch) | |
| tree | 8d50007a8be9be62b217a5efbd717b5f202b1a41 /org.eclipse.jgit/src/org/eclipse/jgit/lib/ThreadSafeProgressMonitor.java | |
| parent | 0544c9af4159ede49a42119833f680b2435e78a7 (diff) | |
| download | jgit-7668a462829b12e4f6a192c43157152ef63ff305.tar.gz jgit-7668a462829b12e4f6a192c43157152ef63ff305.zip | |
PullCommand: support upstream configuration for local branches
When creating a local branch based on another local branch, the
upstream configuration contains "." as origin and the source branch
as "merge". The PullCommand should support this by skipping the
fetch step altogether and use the base branch to merge with.
Change-Id: I260a1771aeeffca5b0161d1494fd63c672ecc2a6
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib/ThreadSafeProgressMonitor.java')
0 files changed, 0 insertions, 0 deletions