Hi, when you cherry-pick -n a commit that has changes to a file missing in the current tree, that file will be added as "Unmerged". A subsequent cherry-pick that tries to pick a commit that has changes to that file will then fail with: fatal: git-write-tree: error building trees I've attached a small shell script to easily reproduce that. git version 1.5.4.rc2.84.gf85fd That specific use of cherry-pick might be an user error, but, if possible, git should give a less cryptic error message. Bj
| Srivatsa Vaddagiri | containers (was Re: -mm merge plans for 2.6.23) |
| Greg KH | [GIT PATCH] driver core patches against 2.6.24 |
| Tarkan Erimer | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Benjamin Herrenschmidt | Re: [PATCH] Remove process freezer from suspend to RAM pathway |
git: | |
| Jarek Poplawski | [PATCH take 2] pkt_sched: Protect gen estimators under est_lock. |
| David Miller | [GIT]: Networking |
| Gerhard Pircher | 3c59x: shared interrupt problem |
| Gerrit Renker | [PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side) |
