diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-11 14:28:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-11 14:28:35 -0700 |
| commit | ac39efbdf3d41443c40166b7578b7fb87c2f3b60 (patch) | |
| tree | f72e1c547e81130e237246590769c06a75c89f46 /Documentation/rev-list-options.txt | |
| parent | 10d9d887ecdc81197162d7bbe5dfc0d028498fd6 (diff) | |
| parent | e534735a4cd778ac8172f543869a20894c1022a6 (diff) | |
| download | git-ac39efbdf3d41443c40166b7578b7fb87c2f3b60.tar.gz | |
Merge branch 'maint'
* maint:
Re-fix rev-list-options documentation
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 9e20713664..be84721781 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -267,8 +267,7 @@ used in the output. When the starting commit is specified as 'commit@\{now}', output also uses 'commit@\{timestamp}' notation instead. Under '\--pretty=oneline', the commit message is prefixed with this information on the same line. -+ -Cannot be combined with '\--reverse'. +This option cannot be combined with '\--reverse'. See also linkgit:git-reflog[1]. --merge:: |