summaryrefslogtreecommitdiff
path: root/lib/git-merge-changelog.c
Commit message (Collapse)AuthorAgeFilesLines
* diffseq: remove TOO_EXPENSIVE heuristicPaul Eggert2014-02-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | Problem with diffutils reported by Vincent Lefevre in <http://bugs.gnu.org/16848>. The simplest solution is to remove the TOO_EXPENSIVE heuristic that I added to GNU diff in 1993. Although appropriate for circa-1993 hardware, these days the heuristic seems to be more trouble than it's worth. * lib/diffseq.h: Modernize citations. (struct context): Remove member too_expensive. All uses changed. (struct partition): Remove members lo_minimal, hi_minimal. All uses changed. (diag, compareseq): Remove arg find_minimal. All uses changed. (diag): Remove the TOO_EXPENSIVE heuristic that I added back in 1993 to make 'diff' run faster (but not as well) on large inputs. These days, computers are fast enough that it's typically better to run slower but more accurately. * lib/fstrcmp.c: Remove duplicate comment. * lib/fstrcmp.c (strcmp_bounded): * lib/git-merge-changelog.c (compute_differences): Adjust to diffseq.h changes.
* git-merge-changelog: add specific example on how to use with hg.Mark Wielaard2012-03-201-1/+9
| | | | * lib/git-merge-changelog.c: Add example on how to use in .hgrc.
* git-merge-changelog: Report bugs to bug-gnulib@gnu.org.Mark Wielaard2012-03-201-1/+1
| | | | | git-merge-changelog is maintained in gnulib, so bug reports should go to bug-gnulib@gnu.org, not bug-gnu-gettext@gnu.org.
* maint: spelling fixesPaul Eggert2012-02-051-1/+1
|
* Use ', not `, for quoting output.Paul Eggert2012-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * build-aux/announce-gen (usage, sizes, print_news_deltas) (print_changelog_deltas, get_tool_versions, main program): * build-aux/git-version-gen: * build-aux/gitlog-to-changelog (usage, parse_amend_file): * build-aux/move-if-change (help): * build-aux/useless-if-before-free (usage, main program): * check-module (parse_module_file, usage) (find_included_lib_files, check_module): * lib/argmatch.c (main) [TEST]: * lib/argp-help.c (_help): * lib/getopt1.c (main) [TEST]: * lib/git-merge-changelog.c (usage): * lib/xstrtol-error.c (xstrtol_error): * m4/alloca.m4 (_AC_LIBOBJ_ALLOCA): * m4/argz.m4 (gl_FUNC_ARGZ): * m4/bison.m4 (gl_BISON): * m4/calloc.m4 (gl_FUNC_CALLOC_GNU): * m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): * m4/flexmember.m4 (AC_C_FLEXIBLE_ARRAY_MEMBER): * m4/fpending.m4 (gl_PREREQ_FPENDING): * m4/gc-random.m4 (gl_GC_RANDOM): * m4/intl.m4 (gt_CHECK_DECL): * m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): * m4/longlong.m4 (AC_TYPE_LONG_LONG_INT) (AC_TYPE_UNSIGNED_LONG_LONG_INT): * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): * m4/lstat.m4 (gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK): * m4/onceonly.m4 (AC_CHECK_FUNCS_ONCE): * m4/posixver.m4 (gl_DEFAULT_POSIX2_VERSION): * tests/test-dirname.c (main): * tests/test-getpass.c (main): * tests/test-iconvme.c (main): * tests/test-parse-datetime.c (LOG): * tests/test-xstrtoimax.sh: * tests/test-xstrtol.sh: * tests/test-xstrtoll.sh: * tests/test-xstrtoumax.sh: * tests/unigbrk/test-uc-is-grapheme-break.c (main): * top/GNUmakefile (abort-due-to-no-makefile): Quote 'like this', not `like this', as per the recent change to the GNU coding standards.
* git-merge-changelog: add doc relating to use with bzr and hg.Brian Gough2010-08-141-8/+37
|
* git-merge-changelog: Enable --split-merged-entry by default.Bruno Haible2010-05-231-3/+4
|
* Move the malloc checking from module 'list' to new module 'xlist'.Bruno Haible2009-12-141-1/+1
|
* Use spaces for indentation, not tabs.Bruno Haible2009-12-101-755/+755
|
* Fix an assertion failure.Bruno Haible2009-07-041-29/+36
|
* Speedup git-merge-changelog for git cherry-pick.Bruno Haible2009-07-031-79/+173
|
* Fix small mistake.Bruno Haible2009-07-031-2/+2
|
* Speed up approximate search for matching ChangeLog entries.Bruno Haible2009-07-021-8/+17
|
* Add comment.Bruno Haible2009-07-021-2/+4
|
* 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