update cherry to use git-log
Signed-off-by: Nico Schottelius <nico@denkbrett.schottelius.org>
This commit is contained in:
parent
91a24f2e57
commit
3801d72e51
3 changed files with 7 additions and 8 deletions
|
@ -18,12 +18,11 @@
|
||||||
|
|
||||||
echo "Displaying commits you don't have in your tree"
|
echo "Displaying commits you don't have in your tree"
|
||||||
|
|
||||||
for remote in $(awk '$2 ~ /git/ { print $1 }' Next/Trees); do
|
for remote in $(git-branch -r); do
|
||||||
url=$(awk "\$1 ~ /$remote/ { print \$3 }" Next/Trees)
|
#echo "==> Cherry: $remote ..."
|
||||||
rurl=$(echo $url | awk -F'#' '{ print $1 }')
|
# is slow
|
||||||
branch=$(echo $url | awk -F'#' '{ print $2 }')
|
# git-cherry $remote | grep -v '^+ '
|
||||||
|
|
||||||
cherry="$remote/$branch"
|
# is fast
|
||||||
echo "Cherry: $cherry ..."
|
git-log --pretty=oneline --left-right master..$remote | sed "s;^;$remote;"
|
||||||
git-cherry $cherry | grep -v '^+ '
|
|
||||||
done
|
done
|
||||||
|
|
0
linux/init-branches.sh
Normal file → Executable file
0
linux/init-branches.sh
Normal file → Executable file
0
linux/merge-branches.sh
Normal file → Executable file
0
linux/merge-branches.sh
Normal file → Executable file
Loading…
Reference in a new issue