diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2016-10-11 00:34:42 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-10-11 00:34:55 +0200 |
| commit | 8f6b75f7ade43c44fcfec5a02cca50439f365f19 (patch) | |
| tree | 37cf9631b2821bbca232e1b8607f68d5cf38f2fe /org.eclipse.jgit.pgm/src | |
| parent | 26832a00e4f6cfbc3b0319e08665755d54ce3689 (diff) | |
| parent | 15341ce5777c25dd41a52cf4b633ba363e3bf7a2 (diff) | |
| download | jgit-8f6b75f7ade43c44fcfec5a02cca50439f365f19.tar.gz jgit-8f6b75f7ade43c44fcfec5a02cca50439f365f19.zip | |
Merge branch 'stable-4.5'
* stable-4.5:
pgm: Fix misspelled key of an externalized string
Add missing online help for Ketch server type option in CLI daemon
Remove wrong junit dependencies in org.eclipse.jgit.pgm
Change-Id: I9cac024c0b488101b539c713b0f5ffc8c01b55bd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/src')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java index fa94d2c1c4..ce4faf83a7 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java @@ -50,7 +50,7 @@ import org.eclipse.jgit.api.Git; import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Option; -@Command(common = true, usage = "usage_clean") +@Command(common = true, usage = "usage_Clean") class Clean extends TextBuiltin { @Option(name = "-d", usage = "usage_removeUntrackedDirectories") private boolean dirs = false; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java index 03f3fac0b6..a7bdde9f66 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java @@ -101,7 +101,7 @@ class Daemon extends TextBuiltin { @Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk") boolean exportAll; - @Option(name = "--ketch") + @Option(name = "--ketch", metaVar = "metaVar_ketchServerType", usage = "usage_ketchServerType") KetchServerType ketchServerType; enum KetchServerType { |