]> git.hungrycats.org Git - linux/commitdiff
zygo: pick-kernel: fix pickList zygo-3.18.11-zb64-btrfs
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Mon, 20 Apr 2015 01:54:36 +0000 (21:54 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Mon, 20 Apr 2015 20:26:27 +0000 (16:26 -0400)
zygo/pick-kernel

index 0587985730c545d979f80b0211e0040e27a2fd60..0fee5a92ba3a1c77d019676287a0dcc6a0d07a06 100755 (executable)
@@ -17,14 +17,13 @@ for x in $hashes; do
                git cherry-pick --abort
                prefixString='----'
        fi
-       pickList="$prefixString $(git log --oneline --no-walk "$x")"
+       pickList="$pickList
+$prefixString $(git log --oneline --no-walk "$x")"
 done
 
 if [ -n "$pickList" ]; then
-       git merge -s ours $hashes -m"zygo: cherry-picked up to $tips
-Git-Log-Args: $*
-
-Commits included: 
+       git merge -s ours $hashes -m"zygo: cherry-picked up to $*
 
+Commits included (++++) and excluded (----):
 $pickList"
 fi