A hint: commits that are not cherry-picked between branches

[Dmitry Kazakov]

Hi, Jaroslaw!

I usually use the git cherry command to find out what commits are not yet
ported. It uses some nice commit-diff algorithm so unless the commit was
modified while cherry-picking it'll be reported correctly.

git cherry -v HEAD origin/master

I usually combine it with emacs and it's 'hl-line-mode' and
'scroll-lock-mode' like this:

git cherry -v HEAD origin/master | pipeemacs

where pipemacs is a tiny script (for some reason emacs-x11 cannot read from
the stdin):

#!/bin/sh
TMP=$(mktemp)
cat > $TMP
if cat $TMP | grep "diff --git" > /dev/null;  then
    mv $TMP $TMP.diff;
    TMP=$TMP.diff;
fi
emacs-x11 $TMP
rm $TMP





On Tue, Mar 4, 2014 at 1:43 AM, Jaroslaw Staniek <staniek at kde.org> wrote:

> And the script...
>
> _______________________________________________
> calligra-devel mailing list
> calligra-devel at kde.org
> https://mail.kde.org/mailman/listinfo/calligra-devel
>
>


-- 
Dmitry Kazakov
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20140304/17b7751e/attachment.htm>