log lib/git-merge-changelog.c @ 10780:5c7a68d31801

age author description
Tue, 20 May 2008 00:16:32 +0200 Bruno Haible Remove trailing spaces.
Sun, 13 Apr 2008 18:29:05 +0200 Bruno Haible Remove stray semicolon.
Mon, 18 Feb 2008 03:36:33 +0100 Bruno Haible Avoid generating no-op conflicts.
Mon, 18 Feb 2008 03:11:40 +0100 Bruno Haible Speed up by 10%.
Mon, 18 Feb 2008 03:09:00 +0100 Bruno Haible Speed up by 25%.
Mon, 18 Feb 2008 02:41:03 +0100 Bruno Haible Speed up from O(n^2) to O(n).
Mon, 18 Feb 2008 01:55:47 +0100 Bruno Haible New option --split-merged-entry.
Sun, 17 Feb 2008 15:42:34 +0100 Bruno Haible Support the "git pull --rebase" situation.
Mon, 11 Feb 2008 13:24:11 +0100 Bruno Haible Comment changes.
Mon, 11 Feb 2008 01:16:24 +0100 Bruno Haible New module 'git-merge-changelog'.