]> git.neil.brown.name Git - wiggle.git/shortlog
wiggle.git
2023-09-13 NeilBrownDisable *all* backups when --no-backups used master
2023-07-21 NeilBrownMakefile: ensure "make lib" sees changes to wiggle.h
2020-10-03 NeilBrownNew release: v1.3 v1.3
2020-10-03 NeilBrownAdd copyright claims through to 2020
2020-10-03 NeilBrownRe-indent code messed up by name-change.
2020-10-03 NeilBrownAdd "wiggle_" prefix to all exported names.
2020-10-03 NeilBrownMove save functions to vpatch.c
2020-10-03 NeilBrownvpatch: make things static that are not shared.
2020-10-03 NeilBrownSplit non-static code out of wiggle.c
2020-10-03 NeilBrownmerge: fix a problem with unmatchable hunks.
2020-09-07 NeilBrownTest must not expose non-determinism.
2020-09-07 NeilBrownAdd heuristic to take shortcut when too slow.
2020-09-07 NeilBrownFix exit status from 'diff'.
2020-09-07 NeilBrowndiff: trim endpoints of search more agressively.
2020-09-07 NeilBrowndiff: allocate csl buf incrementally.
2020-08-29 NeilBrownAutomatically enable --non-space on large files.
2020-08-29 NeilBrownIntroduce --non-space option
2020-08-29 NeilBrowndiff: filter out unmatchable lines before comparing.
2020-08-29 NeilBrownvpatch: fix problems reported by valgrind.
2020-08-28 NeilBrownFix handling of -R with --diff
2020-08-28 NeilBrownMakefile: add support for quite build.
2020-08-26 NeilBrownMakefile: make it easy to place objects in different dir
2019-12-27 NeilBrownNew release - v1.2 v1.2
2019-12-27 NeilBrownMerge github.com:neilbrown/wiggle
2019-12-27 NeilBrownmerge2: guard against over-flowing elcnt
2019-12-27 NeilBrownsplit_stream: guard against body being NULL.
2019-12-27 NeilBrownvpatch: if backups are disabled, don't try to restore.
2019-12-27 NeilBrownvpatch: don't call fileno() on NULL
2019-12-27 NeilBrownvpatch: guard against patch list being empty.
2019-12-27 NeilBrownvpatch: call sort_patches() before main_window().
2019-10-03 NeilBrownMerge pull request #16 from smcameron/master
2019-10-02 Stephen M.... Do not test for NULL before free()
2019-10-01 Stephen M.... Fix very minor memory leaks in do_merge()
2019-09-10 NeilBrownMerge pull request #15 from gobenji/master
2019-08-27 Benjamin PoirierPreserve file mode when using doing --merge --replace
2019-08-03 NeilBrownAdd --no-backup option
2019-08-03 NeilBrownextract: allow blank lines in unified diffs.
2019-08-03 NeilBrownAvoid use of "?:"
2019-08-03 NeilBrownFix array bounds error in diff_path
2019-01-25 NeilBrownMerge pull request #11 from e7appew/gcc8-format-security
2019-01-25 NeilBrownMerge pull request #10 from e7appew/fix-typos
2019-01-24 Carlos MaddelaFix format overflow and truncation warnings with GCC-8.
2019-01-24 Carlos MaddelaFix some typos.
2017-09-29 NeilBrownInitialize 'o' just in case.
2017-09-28 NeilBrownRelease v1.1 v1.1
2017-09-28 NeilBrownhash.c: add /* fallthrough markers */
2017-09-28 NeilBrownvpatch: fix build warning
2014-05-13 NeilBrownMerge branch 'allow-prefix-on-make' of https://github...
2014-05-13 Andreas KohnUse install(1) -d explicitly, avoiding the need for -D
2014-05-13 Andreas KohnAdd a PREFIX variable so one can easily install wiggle...
2014-04-08 Jari Aaltoman: Correct preceeding to preceding
2014-01-09 Dimitri John... Fix endian checks as per austin group definitions of...
2013-10-16 NeilBrownMakefile: make it easy to suppress the "-D" flag to...
2013-10-16 NeilBrownMakefile: make it easy to change warning flags.
2013-10-09 NeilBrownMerge branch 'master' of https://github.com/seanfarley...
2013-10-09 Sean Farleymakefile: add -Wno-missing-field-initializers since...
2013-10-09 Sean Farleyvpatch: change prepare_merge to a macro for proper c
2013-10-09 Sean Farleyvpatch: change find_line to a macro for proper c
2013-10-09 Sean Farleyvpatch: change free_stuff to a macro for proper c
2013-08-27 NeilBrownvpatch: avoid warning from gcc-4.4.6
2013-08-27 NeilBrownMakefile: suppress error messages from 'git'.
2013-08-23 NeilBrownRelease wiggle v1.0 v1.0
2013-08-23 NeilBrownAdd 'dovtest'.
2013-08-23 NeilBrownBrowser: avoid unused-variable error from valgrind.
2013-08-23 NeilBrownBrowser: refine 'c' and 'x' commands.
2013-08-23 NeilBrownBrowser: remove some more infinite loops.
2013-08-23 NeilBrownMan page updates.
2013-08-23 NeilBrownHack to improve view of ignore-blank conflicts.
2013-08-23 NeilBrownBrowser: avoid possible infinite loop.
2013-08-23 NeilBrownBrowser: discard VTRACE code.
2013-08-23 NeilBrownBrowser: disable ignore-blanks after editing.
2013-08-23 NeilBrownBrowser: base tempfile name on that of original file.
2013-08-23 NeilBrownBrowser: delete temporary file after reading it back in.
2013-08-22 NeilBrownUpdate copyright claims.
2013-08-22 NeilBrownman page: mention lack of Unicode support
2013-08-22 NeilBrownman page: update instructions for git usage.
2013-08-22 NeilBrownman page: Quote some more hyphen.
2013-08-22 NeilBrownAdd --output option to redirect output.
2013-08-22 NeilBrownBrowser: if editing leaves no conflicts, display diff.
2013-08-22 NeilBrownBrowser: pass line number to editor when editting the...
2013-08-22 NeilBrownBrowser: edit merge in a temporary file.
2013-08-21 NeilBrownBrowser -- support page-up and page-down
2013-08-21 NeilBrownAllow diffs to be browsed.
2013-08-21 NeilBrownBrowser: add 'v' to open file in an editor.
2013-08-21 NeilBrownRemove stray file.
2013-08-21 NeilBrownmanpage: add notes about how to integrate with git.
2013-08-21 NeilBrownAdd --report-wiggles option
2013-08-21 NeilBrownBrowser: update all of status line in one place.
2013-08-21 NeilBrownPreserve per-hunk "comment" field.
2013-08-21 NeilBrownvpatch: simplify display of editted mergers.
2013-08-20 NeilBrownBrowser: add 'c' command to accept a conflict.
2013-08-20 NeilBrownMake some fatal errors more helpful.
2013-08-20 NeilBrownBrowse: make sure 'X' doesn't loop forever searching...
2013-08-20 NeilBrownAllow interactive setting of "--ignore-blanks" flag.
2013-08-20 NeilBrownBrowse: suppress "last-key" debugging.
2013-08-20 NeilBrownBrowse: allow "--replace" to be requested while viewing.
2013-08-20 NeilBrownBrowser: highlight spaces at the end of a line.
2013-08-19 NeilBrownAdd some test after the markers in a merge.
2013-08-19 NeilBrownmerge: fix another bug in isolate_conflicts.
2013-08-19 NeilBrownvpatch: discard 'ignored' for 'oldtype'.
next