aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-08-22 17:52:31 +0200
committerMattias Andrée <maandree@operamail.com>2013-08-22 17:52:31 +0200
commit73d2669b3d8dcaf74d2e7c65b781126f5c220031 (patch)
tree6329946bb4177a65858569613b3477e252ad8ff6 /using-git.texinfo
parentannotated tag objects (diff)
downloadusing-git-73d2669b3d8dcaf74d2e7c65b781126f5c220031.tar.gz
using-git-73d2669b3d8dcaf74d2e7c65b781126f5c220031.tar.bz2
using-git-73d2669b3d8dcaf74d2e7c65b781126f5c220031.tar.xz
cherry-picking
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
-rw-r--r--using-git.texinfo14
1 files changed, 13 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index 507cd32..546aecc 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -1169,7 +1169,19 @@ git push :refs/tags/'RELEASE_VERSION'
@node Cherry picking
@section Cherry picking
-TODO
+Cherry picking is the action of applying
+changes made in another commit. It is a
+create tool both for apply changes made
+to another branch or to backport features.
+
+Cherry picking works just merging branches,
+except, instead of choosing a branch to pull
+and apply all it changes you choose
+individual commits, and commits ranges:
+
+@example
+git cherry-pick COMMIT_ID
+@end example