diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2013-06-22 02:19:08 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-09-09 22:54:52 +0200 |
commit | 01e793a3ffa3d5512826f85e108df82ca9a59391 (patch) | |
tree | 4cd35ba378593dd8e3d11c3bce62d623418d3920 /org.eclipse.jgit.pgm/resources | |
parent | c2a9f9e742f7e6633af130823c154a485e6071b2 (diff) | |
download | jgit-01e793a3ffa3d5512826f85e108df82ca9a59391.tar.gz jgit-01e793a3ffa3d5512826f85e108df82ca9a59391.zip |
Add missing usage texts for JGit commandline commands
Also update help text for the merge command now supporting recursive
strategy as the default merge strategy.
Change-Id: I07886fe875c407e2244f562c003bb9d04f398026
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/resources')
-rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties | 31 |
1 files changed, 30 insertions, 1 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 2843c3be9a..bda8f781e0 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 @@ -186,16 +186,36 @@ usage_CommitPaths=see --only usage_CreateABareRepository=Create a bare repository usage_CreateATag=Create a tag usage_CreateAnEmptyGitRepository=Create an empty git repository +usage_DiffAlgorithms=Test performance of jgit's diff algorithms usage_DisplayTheVersionOfJgit=Display the version of jgit +usage_Gc=Cleanup unnecessary files and optimize the local repository +usage_Glog=View commit history as a graph +usage_IndexPack=Build pack index file for an existing packed archive +usage_LsRemote=List references in a remote repository +usage_LsTree=List the contents of a tree object +usage_MakeCacheTree=Show the current cache tree structure +usage_MergeBase=Find as good common ancestors as possible for a merge usage_MergesTwoDevelopmentHistories=Merges two development histories +usage_ReadDirCache= Read the DirCache 100 times +usage_RebuildCommitGraph=Recreate a repository from another one's commit graph usage_RepositoryToReadFrom=Repository to read from usage_RepositoryToReceiveInto=Repository to receive into +usage_RevList=List commit objects in reverse chronological order +usage_RevParse=Pick out and massage parameters +usage_RevParseAll=Show all refs found in refs/ usage_ServerSideBackendForJgitFetch=Server side backend for 'jgit fetch' usage_ServerSideBackendForJgitPush=Server side backend for 'jgit push' +usage_ShowCacheTree=Show cache tree usage_ShowDiffs=Show diffs +usage_ShowDiffTree=Compare the content and mode of blobs found via two tree objects +usage_ShowDirCache= Show the DirCache +usage_ShowPackDelta=Show pack delta for given object +usage_ShowRef=List references in a local repository usage_Status=Show the working tree status usage_StopTrackingAFile=Stop tracking a file +usage_TextHashFunctions=Scan repository to compute maximum number of collisions for hash functions usage_UpdateRemoteRepositoryFromLocalRefs=Update remote repository from local refs +usage_WriteDirCache=Write the DirCache usage_abbrevCommits=abbreviate commits to N + 1 digits usage_abortConnectionIfNoActivity=abort connection if no activity usage_actOnRemoteTrackingBranches=act on remote-tracking branches @@ -204,6 +224,7 @@ usage_alterTheDetailShown=alter the detail shown usage_approveDestructionOfRepository=approve destruction of repository usage_archive=zip up files from the named tree usage_archiveFormat=archive format. Currently supported formats: 'tar', 'zip' +usage_archiveOutput=output file to write the archive to usage_blameLongRevision=show long revision usage_blameRange=annotate only the given range usage_blameRawTimestamp=show raw timestamp @@ -220,6 +241,10 @@ usage_cached=compare against index usage_checkout=Checkout a branch to the working tree usage_cloneRepositoryIntoNewDir=Clone a repository into a new directory usage_configFile=configuration file +usage_configGlobal=use global configuration in ~/.gitconfig +usage_configList=List all variables set in config file +usage_configLocal=use local configuration in .git/config +usage_configSystem=use system-wide configuration in $(prefix)/etc/gitconfig usage_configureTheServiceInDaemonServicename=configure the service in daemon.servicename usage_createBranchAndCheckout=create branch and checkout usage_deleteBranchEvenIfNotMerged=delete branch (even if not merged) @@ -253,7 +278,11 @@ usage_listBothRemoteTrackingAndLocalBranches=list both remote-tracking and local usage_listCreateOrDeleteBranches=List, create, or delete branches usage_logAllPretty=format:%H %ct %P' output=log --all '--pretty=format:%H %ct %P' output usage_manageReflogInformation=Manage reflog information -usage_mergeStrategy=Use the given merge strategy. Can be supplied more than once to specify them in the order they should be tried. If there is no -s option, the resolve strategy is used. Currently the following strategies are supported: ours, theirs, simple-two-way-in-core, resolve +usage_mergeFf=When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. +usage_mergeNoFf=Create a merge commit even when the merge resolves as a fast-forward. +usage_mergeFfOnly=Refuse to merge and exit with a non-zero status unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward. +usage_mergeRef=Ref to be merged +usage_mergeStrategy=Use the given merge strategy. Can be supplied more than once to specify them in the order they should be tried. If there is no -s option, the recursive strategy is used. Currently the following strategies are supported: ours, theirs, simple-two-way-in-core, resolve, recursive usage_moveRenameABranch=move/rename a branch usage_nameStatus=show only name and status of files usage_noCommit=Don't commit after a successful merge |