]> git.hungrycats.org Git - linux/commitdiff
zygo: pick-kernel: fix pickList zygo-3.19.5-zb64
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 17:50:57 +0000 (13:50 -0400)
(cherry picked from commit 09b94611c9d032e104ad96334330415ee62b19ef)

zygo/pick-kernel

index 2a34296643706e8db1f8e97a3fbe6803d73aef44..0fee5a92ba3a1c77d019676287a0dcc6a0d07a06 100755 (executable)
@@ -17,13 +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 $*
 
 Commits included (++++) and excluded (----):
-
 $pickList"
 fi