diff options
-rw-r--r-- | documentation/kernel-manual/kernel-how-to.xml | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml index 24da31edcb..2d7f1df97e 100644 --- a/documentation/kernel-manual/kernel-how-to.xml +++ b/documentation/kernel-manual/kernel-how-to.xml | |||
@@ -308,32 +308,35 @@ | |||
308 | <title>Show a Particular Feature or Branch Change</title> | 308 | <title>Show a Particular Feature or Branch Change</title> |
309 | 309 | ||
310 | <para> | 310 | <para> |
311 | Significant features or branches are tagged in the Yocto Project tree to divide | 311 | Developers use tags in the Yocto Project tree to divide changes for significant |
312 | changes. | 312 | features or branches. |
313 | Remember to first determine (or add) the tag of interest. | 313 | Once you know a particular tag, you can use Git commands |
314 | to show changes associated with the tag and find the branches that contain | ||
315 | the feature. | ||
314 | <note> | 316 | <note> |
315 | Because BSP branch, <filename>kernel.org</filename>, and feature tags are all | 317 | Because BSP branch, <filename>kernel.org</filename>, and feature tags are all |
316 | present, there could be many tags. | 318 | present, there could be many tags. |
317 | </note> | 319 | </note> |
320 | The <filename>git show <tag></filename> command shows changes that are tagged by | ||
321 | a feature. | ||
322 | Here is an example that shows changes tagged by the <filename>systemtap</filename> | ||
323 | feature: | ||
318 | <literallayout class='monospaced'> | 324 | <literallayout class='monospaced'> |
319 | # show the changes tagged by a feature | 325 | $ git show systemtap |
320 | > git show <tag> | 326 | </literallayout> |
321 | > eg: git show yaffs2 | 327 | You can use the <filename>git branch --contains <tag></filename> command |
322 | 328 | to show the branches that contain a particular feature. | |
323 | # determine which branches contain a feature | 329 | This command shows the branches that contain the <filename>systemtap</filename> |
324 | > git branch --contains <tag> | 330 | feature: |
325 | 331 | <literallayout class='monospaced'> | |
326 | # show the changes in a kernel type | 332 | $ git branch --contains systemtap |
327 | > git whatchanged yocto/base..<kernel type> | ||
328 | > eg: git whatchanged yocto/base..yocto/standard/base | ||
329 | </literallayout> | 333 | </literallayout> |
330 | </para> | 334 | </para> |
331 | 335 | ||
332 | <para> | 336 | <para> |
333 | You can use many other comparisons to isolate BSP changes. | 337 | You can use many other comparisons to isolate BSP and kernel changes. |
334 | For example, you can compare against <filename>kernel.org</filename> tags | 338 | For example, you can compare against <filename>kernel.org</filename> tags |
335 | (e.g. v2.6.27.18, etc), or | 339 | such as the <filename>v3.4</filename> tag. |
336 | you can compare against subsystems (e.g. <filename>git whatchanged mm</filename>). | ||
337 | </para> | 340 | </para> |
338 | </section> | 341 | </section> |
339 | </section> | 342 | </section> |