summaryrefslogtreecommitdiff
path: root/lib/git-merge-changelog.c
Commit message (Expand)AuthorAgeFilesLines
* Typo in comment.Bruno Haible2009-03-181-1/+1
* Remove trailing spaces.Bruno Haible2008-05-201-1/+1
* Remove stray semicolon.Bruno Haible2008-04-131-1/+1
* Avoid generating no-op conflicts.Bruno Haible2008-02-181-3/+10
* Speed up by 10%.Bruno Haible2008-02-181-4/+7
* Speed up by 25%.Bruno Haible2008-02-181-17/+32
* Speed up from O(n^2) to O(n).Bruno Haible2008-02-181-1/+2
* New option --split-merged-entry.Bruno Haible2008-02-181-129/+357
* Support the "git pull --rebase" situation.Bruno Haible2008-02-171-6/+13
* Comment changes.Bruno Haible2008-02-111-3/+3
* New module 'git-merge-changelog'.Bruno Haible2008-02-111-0/+1273