aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm
diff options
context:
space:
mode:
authorChristian Halstrick <christian.halstrick@sap.com>2019-03-25 10:26:21 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2019-03-25 10:26:21 -0400
commit7699ecd8fa0e34f188e6b62de76e5b4146903545 (patch)
tree16fba6fd8c342b16f284be9c810c00d5aef393ca /org.eclipse.jgit.pgm
parent00523f38a19b073990239b0f837efa14197764c7 (diff)
parenta24fc94ccdc5d3eef754725a52568928cb4e7189 (diff)
downloadjgit-7699ecd8fa0e34f188e6b62de76e5b4146903545.tar.gz
jgit-7699ecd8fa0e34f188e6b62de76e5b4146903545.zip
Merge "diff: Add "--staged" as alias to "--cached""
Diffstat (limited to 'org.eclipse.jgit.pgm')
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java2
1 files changed, 1 insertions, 1 deletions
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 7747dc7dd7..3d6ebfd8b6 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
@@ -87,7 +87,7 @@ class Diff extends TextBuiltin {
@Argument(index = 1, metaVar = "metaVar_treeish")
private AbstractTreeIterator newTree;
- @Option(name = "--cached", usage = "usage_cached")
+ @Option(name = "--cached", aliases = { "--staged" }, usage = "usage_cached")
private boolean cached;
@Option(name = "--", metaVar = "metaVar_paths", handler = PathTreeFilterHandler.class)