update cherry to use git-log

Signed-off-by: Nico Schottelius <nico@denkbrett.schottelius.org>
This commit is contained in:
Nico Schottelius 2008-08-04 16:26:19 +02:00
parent 91a24f2e57
commit 3801d72e51
3 changed files with 7 additions and 8 deletions

View file

@ -18,12 +18,11 @@
echo "Displaying commits you don't have in your tree"
for remote in $(awk '$2 ~ /git/ { print $1 }' Next/Trees); do
url=$(awk "\$1 ~ /$remote/ { print \$3 }" Next/Trees)
rurl=$(echo $url | awk -F'#' '{ print $1 }')
branch=$(echo $url | awk -F'#' '{ print $2 }')
for remote in $(git-branch -r); do
#echo "==> Cherry: $remote ..."
# is slow
# git-cherry $remote | grep -v '^+ '
cherry="$remote/$branch"
echo "Cherry: $cherry ..."
git-cherry $cherry | grep -v '^+ '
# is fast
git-log --pretty=oneline --left-right master..$remote | sed "s;^;$remote;"
done

0
linux/init-branches.sh Normal file → Executable file
View file

0
linux/merge-branches.sh Normal file → Executable file
View file