summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm/resources
diff options
context:
space:
mode:
authorSasa Zivkov <sasa.zivkov@sap.com>2011-02-21 16:43:06 +0100
committerChris Aniszczyk <caniszczyk@gmail.com>2011-02-23 09:32:23 -0600
commit5f3d577e5a1e8f23a2b6ea6a2bf24516806e01b8 (patch)
tree30fdb0df79177e6903b3bb118867fb186098b6a0 /org.eclipse.jgit.pgm/resources
parent977446e5da257408a3ac1ec9eb3c2258d0bcf061 (diff)
downloadjgit-5f3d577e5a1e8f23a2b6ea6a2bf24516806e01b8.tar.gz
jgit-5f3d577e5a1e8f23a2b6ea6a2bf24516806e01b8.zip
Show notes in Log CLI command
Support for --no-standard-notes and --show-notes=REF options is added to the Log command. The --show-notes option can be specified more than once if more than one notes branch should be used for showing notes. The notes are displayed from note branches in the order how the note branches are specified in the command line. However, the standard note, from the refs/notes/commits, is always displayed as first unless the --no-standard-notes options is given. Change-Id: I4e7940804ed9d388b625b8e8a8e25bfcf5ee15a6 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/resources')
-rw-r--r--org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties3
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
index c1b5c53443..b117cf04cd 100644
--- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
+++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
@@ -82,6 +82,7 @@ metaVar_pass=PASS
metaVar_path=path
metaVar_paths=path ...
metaVar_port=PORT
+metaVar_ref=REF
metaVar_refs=REFS
metaVar_refspec=refspec
metaVar_remoteName=name
@@ -181,6 +182,7 @@ usage_moveRenameABranch=move/rename a branch
usage_nameStatus=show only name and status of files
usage_noPrefix=do not show any source or destination prefix
usage_noRenames=disable rename detection
+usage_noShowStandardNotes=Disable showing notes from the standard /refs/notes/commits branch
usage_onlyMatchAgainstAlreadyTrackedFiles=Only match <filepattern> against already tracked files in the index rather than the working tree
usage_outputFile=Output file
usage_path=path
@@ -198,6 +200,7 @@ usage_resetMixed=Resets the index but not the working tree
usage_setTheGitRepositoryToOperateOn=set the git repository to operate on
usage_showPatch=display patch
usage_showRefNamesMatchingCommits=Show ref names matching commits
+usage_showNotes=Add this ref to the list of note branches from which notes are displayed
usage_srcPrefix=show the source prefix instead of "a/"
usage_symbolicVersionForTheProject=Symbolic version for the project
usage_synchronizeIPZillaData=Synchronize IPZilla data