Fossil SCM
Add short option -ci for --checkin in 'fossil diff'.
Commit
c8a7ee7e4cf78ae2270bd6d94ce2297e1518131719c57081290e1bd0020a8aa1
Parent
73ba7637be0d4e3…
1 file changed
+2
-2
+2
-2
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -1037,11 +1037,11 @@ | ||
| 1037 | 1037 | ** as binary |
| 1038 | 1038 | ** --branch BRANCH Show diff of all changes on BRANCH |
| 1039 | 1039 | ** --brief Show filenames only |
| 1040 | 1040 | ** -b|--browser Show the diff output in a web-browser |
| 1041 | 1041 | ** --by Shorthand for "--browser -y" |
| 1042 | -** --checkin VERSION Show diff of all changes in VERSION | |
| 1042 | +** -ci|--checkin VERSION Show diff of all changes in VERSION | |
| 1043 | 1043 | ** --command PROG External diff program. Overrides "diff-command" |
| 1044 | 1044 | ** -c|--context N Show N lines of context around each change |
| 1045 | 1045 | ** --diff-binary BOOL Include binary files with external commands |
| 1046 | 1046 | ** --exec-abs-paths Force absolute path names on external commands |
| 1047 | 1047 | ** --exec-rel-paths Force relative path names on external commands |
| @@ -1079,11 +1079,11 @@ | ||
| 1079 | 1079 | return; |
| 1080 | 1080 | } |
| 1081 | 1081 | isGDiff = g.argv[1][0]=='g'; |
| 1082 | 1082 | zFrom = find_option("from", "r", 1); |
| 1083 | 1083 | zTo = find_option("to", 0, 1); |
| 1084 | - zCheckin = find_option("checkin", 0, 1); | |
| 1084 | + zCheckin = find_option("checkin", "ci", 1); | |
| 1085 | 1085 | zBranch = find_option("branch", 0, 1); |
| 1086 | 1086 | againstUndo = find_option("undo",0,0)!=0; |
| 1087 | 1087 | if( againstUndo && ( zFrom!=0 || zTo!=0 || zCheckin!=0 || zBranch!=0) ){ |
| 1088 | 1088 | fossil_fatal("cannot use --undo together with --from, --to, --checkin," |
| 1089 | 1089 | " or --branch"); |
| 1090 | 1090 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1037,11 +1037,11 @@ | |
| 1037 | ** as binary |
| 1038 | ** --branch BRANCH Show diff of all changes on BRANCH |
| 1039 | ** --brief Show filenames only |
| 1040 | ** -b|--browser Show the diff output in a web-browser |
| 1041 | ** --by Shorthand for "--browser -y" |
| 1042 | ** --checkin VERSION Show diff of all changes in VERSION |
| 1043 | ** --command PROG External diff program. Overrides "diff-command" |
| 1044 | ** -c|--context N Show N lines of context around each change |
| 1045 | ** --diff-binary BOOL Include binary files with external commands |
| 1046 | ** --exec-abs-paths Force absolute path names on external commands |
| 1047 | ** --exec-rel-paths Force relative path names on external commands |
| @@ -1079,11 +1079,11 @@ | |
| 1079 | return; |
| 1080 | } |
| 1081 | isGDiff = g.argv[1][0]=='g'; |
| 1082 | zFrom = find_option("from", "r", 1); |
| 1083 | zTo = find_option("to", 0, 1); |
| 1084 | zCheckin = find_option("checkin", 0, 1); |
| 1085 | zBranch = find_option("branch", 0, 1); |
| 1086 | againstUndo = find_option("undo",0,0)!=0; |
| 1087 | if( againstUndo && ( zFrom!=0 || zTo!=0 || zCheckin!=0 || zBranch!=0) ){ |
| 1088 | fossil_fatal("cannot use --undo together with --from, --to, --checkin," |
| 1089 | " or --branch"); |
| 1090 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1037,11 +1037,11 @@ | |
| 1037 | ** as binary |
| 1038 | ** --branch BRANCH Show diff of all changes on BRANCH |
| 1039 | ** --brief Show filenames only |
| 1040 | ** -b|--browser Show the diff output in a web-browser |
| 1041 | ** --by Shorthand for "--browser -y" |
| 1042 | ** -ci|--checkin VERSION Show diff of all changes in VERSION |
| 1043 | ** --command PROG External diff program. Overrides "diff-command" |
| 1044 | ** -c|--context N Show N lines of context around each change |
| 1045 | ** --diff-binary BOOL Include binary files with external commands |
| 1046 | ** --exec-abs-paths Force absolute path names on external commands |
| 1047 | ** --exec-rel-paths Force relative path names on external commands |
| @@ -1079,11 +1079,11 @@ | |
| 1079 | return; |
| 1080 | } |
| 1081 | isGDiff = g.argv[1][0]=='g'; |
| 1082 | zFrom = find_option("from", "r", 1); |
| 1083 | zTo = find_option("to", 0, 1); |
| 1084 | zCheckin = find_option("checkin", "ci", 1); |
| 1085 | zBranch = find_option("branch", 0, 1); |
| 1086 | againstUndo = find_option("undo",0,0)!=0; |
| 1087 | if( againstUndo && ( zFrom!=0 || zTo!=0 || zCheckin!=0 || zBranch!=0) ){ |
| 1088 | fossil_fatal("cannot use --undo together with --from, --to, --checkin," |
| 1089 | " or --branch"); |
| 1090 |