equal
deleted
inserted
replaced
851 Updating away from a bookmark will cause it to be deactivated. |
851 Updating away from a bookmark will cause it to be deactivated. |
852 |
852 |
853 Bookmarks can be pushed and pulled between repositories (see |
853 Bookmarks can be pushed and pulled between repositories (see |
854 :hg:`help push` and :hg:`help pull`). If a shared bookmark has |
854 :hg:`help push` and :hg:`help pull`). If a shared bookmark has |
855 diverged, a new 'divergent bookmark' of the form 'name@path' will |
855 diverged, a new 'divergent bookmark' of the form 'name@path' will |
856 be created. Using :hg:'merge' will resolve the divergence. |
856 be created. Using :hg:`merge` will resolve the divergence. |
857 |
857 |
858 A bookmark named '@' has the special property that :hg:`clone` will |
858 A bookmark named '@' has the special property that :hg:`clone` will |
859 check it out by default if it exists. |
859 check it out by default if it exists. |
860 |
860 |
861 .. container:: verbose |
861 .. container:: verbose |
3210 |
3210 |
3211 - search tracked file contents with xargs and grep:: |
3211 - search tracked file contents with xargs and grep:: |
3212 |
3212 |
3213 hg files -0 | xargs -0 grep foo |
3213 hg files -0 | xargs -0 grep foo |
3214 |
3214 |
3215 See :hg:'help pattern' and :hg:'help filesets' for more information |
3215 See :hg:`help pattern` and :hg:`help filesets` for more information |
3216 on specifying file patterns. |
3216 on specifying file patterns. |
3217 |
3217 |
3218 Returns 0 if a match is found, 1 otherwise. |
3218 Returns 0 if a match is found, 1 otherwise. |
3219 |
3219 |
3220 """ |
3220 """ |