From: Pyeron, Jason J CTR (US) <jason.j.pyeron.ctr@mail.mil>
Date: Tue, 08 Jan 2013 22:43:43 GMT
Subject: trouble using cherry pick
Message-ID: <871B6C10EBEFE342A772D1159D1320853A01B7DD@umechphj.easf.csd.disa.mil>

I am trying to accomplish the diagram below:

* ??????? Merge (or cherry-pick) all changes after 68fb8df from the task1prep branch?
|\
|* ??????? Change ...
|* ??????? Change 3
|* ??????? Change 2
|* ??????? Change 1
|* ??????? Merge branch 'task1' into task1prep
||\
|| * 5e51e26 v1.01 - fixed a typo
|| * 208296f v1.00
|| * 3393bd6 git commit -m 'start of work, created task1widget'
|| * 45dd30d Task 1 Branch (from commit 68fb8df) [orphan]
|* 68fb8df file name cleanup
|* 6f21852 redacted the sensitiveplan.txt for task1
|/ [task1prep branching]
* 9ea54ff the widget template for the widget team to use
* c0b4454 a plan was made
* aa61f73 first commit: readme.txt


Any suggestions?