diff options
| author | Christian Halstrick | 2019-03-05 13:50:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2019-03-05 13:50:42 +0000 |
| commit | 47add1cb58761c7a2a42a89032db6644f8d3912f (patch) | |
| tree | 421cc005c779c2b2f80d832f953fb7cd519e8aef | |
| parent | ea54b6a5a7305a9b68fd7bbca45f919ba978a934 (diff) | |
| parent | 963651b762f6b2a8937eb08766f0233202038e8a (diff) | |
| download | jgit-47add1cb58761c7a2a42a89032db6644f8d3912f.tar.gz jgit-47add1cb58761c7a2a42a89032db6644f8d3912f.tar.xz jgit-47add1cb58761c7a2a42a89032db6644f8d3912f.zip | |
Merge "diff: add option metaVar for --src-prefix and --dst-prefix"
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index 7c4119fd0b..a482ce3f38 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -133,6 +133,7 @@ metaVar_path=path metaVar_paths=path ... metaVar_pattern=pattern metaVar_port=PORT +metaVar_prefix=PREFIX metaVar_ref=REF metaVar_refs=REFS metaVar_refspec=refspec diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java index a86e8dddca..7747dc7dd7 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java @@ -151,12 +151,12 @@ class Diff extends TextBuiltin { diffFmt.setAbbreviationLength(OBJECT_ID_STRING_LENGTH); } - @Option(name = "--src-prefix", usage = "usage_srcPrefix") + @Option(name = "--src-prefix", metaVar = "metaVar_prefix", usage = "usage_srcPrefix") void sourcePrefix(String path) { diffFmt.setOldPrefix(path); } - @Option(name = "--dst-prefix", usage = "usage_dstPrefix") + @Option(name = "--dst-prefix", metaVar = "metaVar_prefix", usage = "usage_dstPrefix") void dstPrefix(String path) { diffFmt.setNewPrefix(path); } |