diff options
| author | Edwin Kempin <edwin.kempin@sap.com> | 2013-05-03 08:18:44 +0200 |
|---|---|---|
| committer | Edwin Kempin <edwin.kempin@sap.com> | 2013-05-03 08:18:44 +0200 |
| commit | 775958645073d8b1535fa725cebd6a23f7514468 (patch) | |
| tree | da1f01adf1bc878fd0ed42c88e0ff3acb6481f14 /Documentation | |
| parent | 2a75561d10ece22410ab91f632d0919723f40395 (diff) | |
| parent | 383041f948c19d23d15a2d4b959e99090ae8b1a4 (diff) | |
Merge branch 'stable-2.6'
* stable-2.6:
Add clarifications in the documentation of the `query` command
Fix RebaseIfNecessary submit strategy
Clarify setup of change cache in documentation
Conflicts:
gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
Change-Id: I24a16fdb6554b12a2da43b7874b36d77cc97e428
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/cmd-query.txt | 11 | ||||
| -rw-r--r-- | Documentation/json.txt | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/cmd-query.txt b/Documentation/cmd-query.txt index f28b4f53b8..66bd845281 100644 --- a/Documentation/cmd-query.txt +++ b/Documentation/cmd-query.txt @@ -28,7 +28,9 @@ DESCRIPTION Queries the change database and returns results describing changes that match the input query. More recently updated changes appear before older changes, which is the same order presented in the -web interface. +web interface. For each matching change, the result contains data +for the change's latest patch set, even if the query matched on an +older patch set (for example an older patch set's sha1 revision). A query may be limited on the number of results it returns with the 'limit:' operator. If no limit is supplied an internal default @@ -41,7 +43,7 @@ Non-option arguments to this command are joined with spaces and then parsed as a query. This simplifies calling conventions over SSH by permitting operators to appear in different arguments. -Query operators may quote values using matched curly braches +Query operators may quote values using matched curly braces (e.g. `reviewerin:{Developer Group}`) to sidestep issues with 2 levels of shell quoting (caller shell invoking SSH, and the SSH command line parser in the server). @@ -49,8 +51,9 @@ command line parser in the server). OPTIONS ------- --format:: - Formatting method for the results. TEXT is the default, - presenting a human readable display. JSON creates one line + Formatting method for the results. `TEXT` is the default, + presenting a human readable display. `JSON` returns + link:json.html#change[change attributes], one line per matching record, with embedded LFs escaped. --current-patch-set:: diff --git a/Documentation/json.txt b/Documentation/json.txt index 3659ed31c7..3893e3f534 100644 --- a/Documentation/json.txt +++ b/Documentation/json.txt @@ -28,7 +28,8 @@ owner:: Owner in <<account,account attribute>>. url:: Canonical URL to reach this change. -commitMessage:: The full commit message for the change. +commitMessage:: The full commit message for the change's current patch +set. createdOn:: Time in seconds since the UNIX epoch when this change was created. |