Fossil SCM
Improved documentation for the --cherrypick and --backout options of the "fossil merge" command.
Commit
29a383e4b6c36c81a0b087fd86d2ec20771c211af27b29b420748b4c967ca748
Parent
6a0ec82baef5b4d…
1 file changed
+10
-1
+10
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -195,11 +195,15 @@ | ||
| 195 | 195 | ** |
| 196 | 196 | ** Only file content is merged. The result continues to use the |
| 197 | 197 | ** file and directory names from the current checkout even if those |
| 198 | 198 | ** names might have been changed in the branch being merged in. |
| 199 | 199 | ** |
| 200 | -** Other options: | |
| 200 | +** Options: | |
| 201 | +** | |
| 202 | +** --backout Do a reverse cherrypick merge against VERSION. | |
| 203 | +** In other words, back out the changes that were | |
| 204 | +** added by VERSION. | |
| 201 | 205 | ** |
| 202 | 206 | ** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead |
| 203 | 207 | ** of the nearest common ancestor. This allows |
| 204 | 208 | ** a sequence of changes in a branch to be merged |
| 205 | 209 | ** without having to merge the entire branch. |
| @@ -209,10 +213,15 @@ | ||
| 209 | 213 | ** option overrides the "binary-glob" setting. |
| 210 | 214 | ** |
| 211 | 215 | ** --case-sensitive BOOL Override the case-sensitive setting. If false, |
| 212 | 216 | ** files whose names differ only in case are taken |
| 213 | 217 | ** to be the same file. |
| 218 | +** | |
| 219 | +** --cherrypick Do a cherrypick merge VERSION into the current | |
| 220 | +** checkout. A cherrypick merge pulls in the changes | |
| 221 | +** of the single check-in VERSION, rather than all | |
| 222 | +** changes back to the nearest common ancestor. | |
| 214 | 223 | ** |
| 215 | 224 | ** -f|--force Force the merge even if it would be a no-op. |
| 216 | 225 | ** |
| 217 | 226 | ** --force-missing Force the merge even if there is missing content. |
| 218 | 227 | ** |
| 219 | 228 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -195,11 +195,15 @@ | |
| 195 | ** |
| 196 | ** Only file content is merged. The result continues to use the |
| 197 | ** file and directory names from the current checkout even if those |
| 198 | ** names might have been changed in the branch being merged in. |
| 199 | ** |
| 200 | ** Other options: |
| 201 | ** |
| 202 | ** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead |
| 203 | ** of the nearest common ancestor. This allows |
| 204 | ** a sequence of changes in a branch to be merged |
| 205 | ** without having to merge the entire branch. |
| @@ -209,10 +213,15 @@ | |
| 209 | ** option overrides the "binary-glob" setting. |
| 210 | ** |
| 211 | ** --case-sensitive BOOL Override the case-sensitive setting. If false, |
| 212 | ** files whose names differ only in case are taken |
| 213 | ** to be the same file. |
| 214 | ** |
| 215 | ** -f|--force Force the merge even if it would be a no-op. |
| 216 | ** |
| 217 | ** --force-missing Force the merge even if there is missing content. |
| 218 | ** |
| 219 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -195,11 +195,15 @@ | |
| 195 | ** |
| 196 | ** Only file content is merged. The result continues to use the |
| 197 | ** file and directory names from the current checkout even if those |
| 198 | ** names might have been changed in the branch being merged in. |
| 199 | ** |
| 200 | ** Options: |
| 201 | ** |
| 202 | ** --backout Do a reverse cherrypick merge against VERSION. |
| 203 | ** In other words, back out the changes that were |
| 204 | ** added by VERSION. |
| 205 | ** |
| 206 | ** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead |
| 207 | ** of the nearest common ancestor. This allows |
| 208 | ** a sequence of changes in a branch to be merged |
| 209 | ** without having to merge the entire branch. |
| @@ -209,10 +213,15 @@ | |
| 213 | ** option overrides the "binary-glob" setting. |
| 214 | ** |
| 215 | ** --case-sensitive BOOL Override the case-sensitive setting. If false, |
| 216 | ** files whose names differ only in case are taken |
| 217 | ** to be the same file. |
| 218 | ** |
| 219 | ** --cherrypick Do a cherrypick merge VERSION into the current |
| 220 | ** checkout. A cherrypick merge pulls in the changes |
| 221 | ** of the single check-in VERSION, rather than all |
| 222 | ** changes back to the nearest common ancestor. |
| 223 | ** |
| 224 | ** -f|--force Force the merge even if it would be a no-op. |
| 225 | ** |
| 226 | ** --force-missing Force the merge even if there is missing content. |
| 227 | ** |
| 228 |