Re: [RFC v2] blame: new option --prefer-first to better handle merged cherry-picks

2014-01-13 Thread Bernhard R. Link
ctable in the case of merged cherry picks, it is also slower in every case. Usually speed will be more important than this exactness, especially as the result will not differ for the common case (if there are no cherry-picked commits merged or when those commits do not touch any files that are oth

[RFC v2] blame: new option --prefer-first to better handle merged cherry-picks

2014-01-12 Thread Bernhard R. Link
e of the graph. Signed-off-by: Bernhard R. Link --- Documentation/blame-options.txt | 6 ++ builtin/blame.c | 7 +-- 2 files changed, 11 insertions(+), 2 deletions(-) Differences to first round: rename option and describe the effect instead of the implementation i

Re: [RFC] blame: new option to better handle merged cherry-picks

2014-01-02 Thread Bernhard R. Link
the cherry-picked commit is blamed on the original and one on the cherry-picked, no matter how you order the parents. (While by having your mainline always the most leftward parent, with the the new option you always get those commit blamed that is the "first one this was introduce

[RFC] blame: new option to better handle merged cherry-picks

2014-01-02 Thread Bernhard R. Link
B---A \ \ ---C---A'--M--- Then without this new option git blame blames the A|A' changes of file b to A while blaming the changes of c to A'. With the new option --no-parent-shortcut it blames both changes to the same commit. Signed-off-by: Bernhard R. Link ---

Re: git:// protocol over SSL/TLS

2013-12-27 Thread Bernhard R. Link
he-middle. Getting catch-all CA-signed certificates is said to no longer available to everyone as easily as it was some years ago, but unless you allow only one private CA (and even there clients often fail) you still should assume everyone resourceful enough to still be able to do MITM. B

Re: git-daemon: needs /root/.config/git/config?

2013-06-09 Thread Bernhard R. Link
r some almost but not quite totally unrelated value. Bernhard R. Link -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: English/German terminology, git.git's de.po, and pro-git

2013-05-23 Thread Bernhard R. Link
n-th hunk. > > > > Not sure if German users would know what "hunk" means, in case we > leave it untranslated. And I'm not sure if I would understand "Kontext". > I tend to leave it untranslated. Anyone found a German translation of the Patch manpage? Translati

Re: possible Improving diff algoritm

2012-12-14 Thread Bernhard R. Link
{ old } + + { + new + } is just the same case in blue. (Although empty lines alone feels not quite optimal, it is at least a good start). Bernhard R. Link -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.or