diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-11 11:53:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-11 11:53:31 +0400 |
| commit | 10d9d887ecdc81197162d7bbe5dfc0d028498fd6 (patch) | |
| tree | f726621f79162565bf066400df697a078680601a /Documentation/rev-list-options.txt | |
| parent | 71b9979bc74b66c1cf961d5c74de5c0b3cbf00a4 (diff) | |
| parent | 4f80b27d48fee1c588810f3341ffe5d14558cea2 (diff) | |
Merge branch 'maint'
* maint:
Documentation: fix invalid reference to 'mybranch' in user manual
Fix deleting reflog entries from HEAD reflog
reflog test: add more tests for 'reflog delete'
Documentation: rev-list-options: Fix -g paragraph formatting
Conflicts:
Documentation/user-manual.txt
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 3aa38097e6..9e20713664 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -264,10 +264,10 @@ With '\--pretty' format other than oneline (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. By default, 'commit@\{Nth}' notation is used in the output. When the starting commit is specified as -'commit@{now}', output also uses 'commit@\{timestamp}' notation +'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'. See also linkgit:git-reflog[1]. |