Fossil SCM
Change the new `-u|--user' option of the `timeline' command to `-u|--for-user' to avoid conflicts with the global `-U|--user' option.
Commit
f4240ecc3227d0d4db511cf9ca83566d71ae1e63138bfe2160ef2fb67e70fb36
Parent
e2783d0789447c3…
1 file changed
+2
-2
+2
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -3644,11 +3644,11 @@ | ||
| 3644 | 3644 | ** ci = file commits only |
| 3645 | 3645 | ** e = technical notes only |
| 3646 | 3646 | ** f = forum posts only |
| 3647 | 3647 | ** t = tickets only |
| 3648 | 3648 | ** w = wiki commits only |
| 3649 | -** -u|--user USER Only show items associated with USER | |
| 3649 | +** -u|--for-user USER Only show items associated with USER | |
| 3650 | 3650 | ** -v|--verbose Output the list of files changed by each commit |
| 3651 | 3651 | ** and the type of each change (edited, deleted, |
| 3652 | 3652 | ** etc.) after the check-in comment. |
| 3653 | 3653 | ** -W|--width N Width of lines (default is to auto-detect). N must be |
| 3654 | 3654 | ** either greater than 20 or it must be zero 0 to |
| @@ -3684,11 +3684,11 @@ | ||
| 3684 | 3684 | } |
| 3685 | 3685 | db_find_and_open_repository(0, 0); |
| 3686 | 3686 | zLimit = find_option("limit","n",1); |
| 3687 | 3687 | zWidth = find_option("width","W",1); |
| 3688 | 3688 | zType = find_option("type","t",1); |
| 3689 | - zUser = find_option("user","u",1); | |
| 3689 | + zUser = find_option("for-user","u",1); | |
| 3690 | 3690 | zFilePattern = find_option("path","p",1); |
| 3691 | 3691 | zFormat = find_option("format","F",1); |
| 3692 | 3692 | zBr = find_option("branch","b",1); |
| 3693 | 3693 | if( find_option("current-branch","c",0)!=0 ){ |
| 3694 | 3694 | if( !g.localOpen ){ |
| 3695 | 3695 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -3644,11 +3644,11 @@ | |
| 3644 | ** ci = file commits only |
| 3645 | ** e = technical notes only |
| 3646 | ** f = forum posts only |
| 3647 | ** t = tickets only |
| 3648 | ** w = wiki commits only |
| 3649 | ** -u|--user USER Only show items associated with USER |
| 3650 | ** -v|--verbose Output the list of files changed by each commit |
| 3651 | ** and the type of each change (edited, deleted, |
| 3652 | ** etc.) after the check-in comment. |
| 3653 | ** -W|--width N Width of lines (default is to auto-detect). N must be |
| 3654 | ** either greater than 20 or it must be zero 0 to |
| @@ -3684,11 +3684,11 @@ | |
| 3684 | } |
| 3685 | db_find_and_open_repository(0, 0); |
| 3686 | zLimit = find_option("limit","n",1); |
| 3687 | zWidth = find_option("width","W",1); |
| 3688 | zType = find_option("type","t",1); |
| 3689 | zUser = find_option("user","u",1); |
| 3690 | zFilePattern = find_option("path","p",1); |
| 3691 | zFormat = find_option("format","F",1); |
| 3692 | zBr = find_option("branch","b",1); |
| 3693 | if( find_option("current-branch","c",0)!=0 ){ |
| 3694 | if( !g.localOpen ){ |
| 3695 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -3644,11 +3644,11 @@ | |
| 3644 | ** ci = file commits only |
| 3645 | ** e = technical notes only |
| 3646 | ** f = forum posts only |
| 3647 | ** t = tickets only |
| 3648 | ** w = wiki commits only |
| 3649 | ** -u|--for-user USER Only show items associated with USER |
| 3650 | ** -v|--verbose Output the list of files changed by each commit |
| 3651 | ** and the type of each change (edited, deleted, |
| 3652 | ** etc.) after the check-in comment. |
| 3653 | ** -W|--width N Width of lines (default is to auto-detect). N must be |
| 3654 | ** either greater than 20 or it must be zero 0 to |
| @@ -3684,11 +3684,11 @@ | |
| 3684 | } |
| 3685 | db_find_and_open_repository(0, 0); |
| 3686 | zLimit = find_option("limit","n",1); |
| 3687 | zWidth = find_option("width","W",1); |
| 3688 | zType = find_option("type","t",1); |
| 3689 | zUser = find_option("for-user","u",1); |
| 3690 | zFilePattern = find_option("path","p",1); |
| 3691 | zFormat = find_option("format","F",1); |
| 3692 | zBr = find_option("branch","b",1); |
| 3693 | if( find_option("current-branch","c",0)!=0 ){ |
| 3694 | if( !g.localOpen ){ |
| 3695 |