diff options
| author | Mathias Kinzler <mathias.kinzler@sap.com> | 2010-10-07 11:37:16 +0200 |
|---|---|---|
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2010-10-08 08:57:28 -0500 |
| commit | db55d13f5f4b641a9390076ced6b1775bcfcd6f6 (patch) | |
| tree | a4b097b6ac803b9c032984bbdbfecd4d88a0d586 /org.eclipse.jgit/src/org/eclipse/jgit/lib | |
| parent | 2160c09dd4f678c5f2f8e730945be637210b39de (diff) | |
| download | jgit-db55d13f5f4b641a9390076ced6b1775bcfcd6f6.tar.gz jgit-db55d13f5f4b641a9390076ced6b1775bcfcd6f6.zip | |
Add "Pull" command
This is the minimal implementation of a "Pull" command. It does not
have any parameters besides the generic progress monitor and timeout.
It works on the currently checked-out branch and assumes that the
configuration contains the keys "branch.<branch name>.remote" and
"branch.<branch name>.merge" to determine the remote configuration
for the fetch and the remote branch name for the merge.
Bug: 303404
Change-Id: I7fe09029996d0cfc09a7d8f097b5d6af1488fa93
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 45e77b1c17..e63f4e9d08 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -54,6 +54,9 @@ public class ConfigConstants { /** The "branch" section */ public static final String CONFIG_BRANCH_SECTION = "branch"; + /** The "remote" section */ + public static final String CONFIG_REMOTE_SECTION = "remote"; + /** The "autocrlf" key */ public static final String CONFIG_KEY_AUTOCRLF = "autocrlf"; @@ -81,4 +84,7 @@ public class ConfigConstants { /** The "rebase" key */ public static final String CONFIG_KEY_REBASE = "rebase"; + /** The "url" key */ + public static final String CONFIG_KEY_URL = "url"; + } |