diff options
| author | Jonathan Nieder <jrn@google.com> | 2015-10-05 19:24:46 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2015-10-05 19:24:48 -0400 |
| commit | c2efb5c96468d718f3037134257ce99e00f9c60e (patch) | |
| tree | cc66130483fb9bea2fbb9f409a629aeadd64d50e /org.eclipse.jgit.pgm | |
| parent | ccad3c7df666ce83043a1e414cda613e6bfc5929 (diff) | |
| parent | cdd7c23446a0030e5b521d91cbb2d3a9c522ccc2 (diff) | |
| download | jgit-c2efb5c96468d718f3037134257ce99e00f9c60e.tar.gz jgit-c2efb5c96468d718f3037134257ce99e00f9c60e.zip | |
Merge "RepoCommand: Add setRecordRemoteBranch option to record upstream branch"
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -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/Repo.java | 4 |
2 files changed, 5 insertions, 0 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 f7591fd80b..64afdad51e 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 @@ -192,6 +192,7 @@ untrackedFiles=Untracked files: updating=Updating {0}..{1} usage_Aggressive=This option will cause gc to more aggressively optimize the repository at the expense of taking much more time usage_bareClone=Make a bare Git repository. That is, instead of creating [DIRECTORY] and placing the administrative files in [DIRECTORY]/.git, make the [DIRECTORY] itself the $GIT_DIR. +usage_branches=Set branch field in .gitmodules usage_Blame=Show what revision and author last modified each line usage_CommandLineClientForamazonsS3Service=Command line client for Amazon's S3 service usage_CommitAll=commit all modified and deleted files diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Repo.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Repo.java index 9b191e6796..db88008e10 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Repo.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Repo.java @@ -58,12 +58,16 @@ class Repo extends TextBuiltin { @Argument(required = true, usage = "usage_pathToXml") private String path; + @Option(name = "--record-remote-branch", usage = "usage_branches") + private boolean branches; + @Override protected void run() throws Exception { new RepoCommand(db) .setURI(uri) .setPath(path) .setGroups(groups) + .setRecordRemoteBranch(branches) .call(); } } |