From 644fa482fa4d4385801948bdae6054d60151902b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Herrero?= Date: Tue, 16 Jan 2024 15:01:51 +0100 Subject: [PATCH] Fix git-cherry-pick.rst The `base_tree` that must be used for a cherry pick is the cherry-picked commit parent. --- docs/recipes/git-cherry-pick.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/recipes/git-cherry-pick.rst b/docs/recipes/git-cherry-pick.rst index 817a56fc..028d3a13 100644 --- a/docs/recipes/git-cherry-pick.rst +++ b/docs/recipes/git-cherry-pick.rst @@ -51,9 +51,9 @@ example `three-argument rebases`_. cherry = repo.revparse_single('9e044d03c') basket = repo.branches.get('basket') - base = repo.merge_base(cherry.id, basket.target) + base_tree = cherry.parents[0].tree - index = repo.merge_trees(base, basket, cherry) + index = repo.merge_trees(base_tree, basket, cherry) tree_id = index.write_tree(repo) author = cherry.author