Skip to content
Clawdemy

References: Cherry-pick and stash

Primary sources

Section titled “Primary sources”
  • Pro Git (Scott Chacon, Ben Straub), 2nd edition, Chapter 7 §7.3 “Stashing and Cleaning”, §7.7 “Reset Demystified” (relevant for cherry-pick conflict recovery), and the broader Chapter 5 discussion of distributed workflows. The canonical reference for both topics. Available free at git-scm.com/book. Licensed under Creative Commons Attribution Non Commercial Share Alike 3.0 Unported.
  • Git official documentation, the git-cherry-pick(1) and git-stash(1) man pages. Authoritative for command flags and edge cases.

Further reading

Section titled “Further reading”
  • “How to cherry-pick multiple commits”, Git documentation on range syntax and the .. vs ^.. distinction. Worth bookmarking.
  • “Recovering lost stashes”, various community write-ups on using git fsck --lost-found to find dropped stashes. Last-resort but possible.
  • “When to use cherry-pick”, Atlassian and GitHub blog posts covering team policies for backports. Useful for thinking about team-level rules.
  • “The stash branch trick”, blog posts on git stash branch, often titled some variant of “the underused git command you should know.” Worth reading once.

How this lesson uses sources

Section titled “How this lesson uses sources”

L11’s commands and conflict-handling patterns follow Pro Git Chapter 7 directly. The “right tool / wrong tool” framing for both cherry-pick and stash is synthesized from team-policy guides and the practical experience of working developers; no single source covers it definitively, so the lesson distills common conventions.

The multi-agent framing in the lesson (cherry-pick as inter-agent transport) is specific to this track and gets fleshed out in L14.

License note

Section titled “License note”

This lesson is written for the T7 track. Pro Git is licensed under Creative Commons BY-NC-SA 3.0 Unported and its concepts are freely usable for educational purposes; this lesson does not reproduce Pro Git text verbatim but builds on its mental models. Git command syntax is from the public domain Git documentation.

This lesson is part of the Clawdemy curriculum, licensed under Creative Commons Attribution NonCommercial Share Alike 4.0 International. Commercial use is licensed separately at /legal/licensing.