git.neil.brown.name Git - wiggle.git/shortlog

]> git.neil.brown.name Git - wiggle.git/shortlog

2013-02-14	NeilBrown	merge: remove some meaningless AlreadyApplied	commit \| commitdiff \| tree \| snapshot
2013-02-14	NeilBrown	bestmatch: improve poor matches.	commit \| commitdiff \| tree \| snapshot
2013-02-13	NeilBrown	merge: remove useless context from the end of a conflict.	commit \| commitdiff \| tree \| snapshot
2013-02-13	NeilBrown	merge: remove useless context at the start of a conflict.	commit \| commitdiff \| tree \| snapshot
2013-02-13	NeilBrown	vpatch: fix another access-beyond-array	commit \| commitdiff \| tree \| snapshot
2013-02-12	NeilBrown	vpatch: allow relevant signals to cause a core-dump.	commit \| commitdiff \| tree \| snapshot
2013-02-12	NeilBrown	vpatch: fix various reference errors found by valgrind.	commit \| commitdiff \| tree \| snapshot
2013-02-07	NeilBrown	Browser: add missing documentation for Save and Restore...	commit \| commitdiff \| tree \| snapshot
2013-02-06	NeilBrown	diff: make rediffing of patches more precise.	commit \| commitdiff \| tree \| snapshot
2013-02-04	NeilBrown	DOC: remove diff.ps due to distribution license issues.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: add mouse movement to merge_window.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: add mouse support for main window.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	Man page updates.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: allow control-C to disable --replace function.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: handle --replace option.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: add X command to ignore all changes in the...	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: make sure render is stable when the merge is...	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: allow changes to be ignored as well as conflict.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: fix display for ignored conflicts.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: add "control-X-O" as a watch to change panes.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: allow mode setting keys to toggle back to ...	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: change appearance of ignored conflicts.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: update status counters when we save a file.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: add 'C' command to go to next conflicted hunk.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: highlight conflicts better.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: update display correctly when editing the merge.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: conditionally auto-save unsaved files when...	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: avoid repeated backups.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: prompt to save change if merge was editted.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: allow a save file to be restored.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: support saving of files.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: Allow a message to be displayed in main folder.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	Separate make_merger out from print_merge2	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: remove lots of memory leaks.	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: allow a file in list to be a 'merger' instead...	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: allow conflict to be ignored with 'x'	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: change args to visible()	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: avoid extra blanks when cursor is in alternate...	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: add 'space' and 'backspace' for page up/down.	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: highlight spaces when they might be important.	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: make ctrl-G search-again-forward, not just...	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: fix check_line to stop at hunk headers.	commit \| commitdiff \| tree \| snapshot
2012-11-12	NeilBrown	vpatch: ensure searching for 'next change' works.	commit \| commitdiff \| tree \| snapshot
2012-11-12	NeilBrown	vpatch: revise the exact meaning of 'CHANGES'.	commit \| commitdiff \| tree \| snapshot
2012-11-12	NeilBrown	vpatch: remove CHANGED	commit \| commitdiff \| tree \| snapshot
2012-11-11	NeilBrown	Browse: ensure we erase all of old type name when updat...	commit \| commitdiff \| tree \| snapshot
2012-11-11	NeilBrown	Browse: git problem in rendering file list.	commit \| commitdiff \| tree \| snapshot
2012-10-08	Manpreet Singh	FreeBSD/*BSD build fixes for wiggle attached and a bug	commit \| commitdiff \| tree \| snapshot
2012-06-26	Chris Peterson	Fix some new compiler warnings.	commit \| commitdiff \| tree \| snapshot
2012-05-17	NeilBrown	vpatch - use 'cols' in main window.	commit \| commitdiff \| tree \| snapshot
2012-05-17	NeilBrown	config.h: include different endian file for OS/X	commit \| commitdiff \| tree \| snapshot
2012-05-17	NeilBrown	extract: removed unused variable: lineno	commit \| commitdiff \| tree \| snapshot
2012-05-15	NeilBrown	merge: make some conflicts less conflicting.	commit \| commitdiff \| tree \| snapshot
2012-05-15	NeilBrown	Browser: fix in_conflict detection while browsing.	commit \| commitdiff \| tree \| snapshot
2012-05-14	Neil Brown	Release 0.9 v0.9	commit \| commitdiff \| tree \| snapshot
2012-05-14	Neil Brown	man page: add documentation for browse mode	commit \| commitdiff \| tree \| snapshot
2012-05-14	Neil Brown	Browser: add a bit of colour to the file-list page.	commit \| commitdiff \| tree \| snapshot
2012-05-14	Neil Brown	Merge: allow merging a multi-patch patchfile.	commit \| commitdiff \| tree \| snapshot
2012-05-13	Neil Brown	main: only pass training args to extract/do_diff/do_merge.	commit \| commitdiff \| tree \| snapshot
2012-05-13	Neil Brown	Move parse_patch and related to new parse.c	commit \| commitdiff \| tree \| snapshot
2012-05-12	Neil Brown	Allow load_file to load segments too.	commit \| commitdiff \| tree \| snapshot
2012-05-12	Neil Brown	Minor man-page fixes.	commit \| commitdiff \| tree \| snapshot
2012-05-12	Neil Brown	Improve make clean	commit \| commitdiff \| tree \| snapshot
2012-05-12	Neil Brown	Add endian.h back to config.h	commit \| commitdiff \| tree \| snapshot
2012-05-11	Neil Brown	Browser: improve decision on when to split window for...	commit \| commitdiff \| tree \| snapshot
2012-05-11	Neil Brown	Browser: improve rendering of conflicts in the the...	commit \| commitdiff \| tree \| snapshot
2012-05-11	Neil Brown	Browse: don't use background colors for added/deleted.	commit \| commitdiff \| tree \| snapshot
2012-05-11	Neil Brown	Browse: avoid display problems when changing view-mode.	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	isolate_conflicts: don't look for eol that cannot be...	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	Don't include endian.h	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	browser: display the type of the merge-node under the...	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	Browser: allow cursor to be displayed in alternate...	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	browse/search: support selectively ignoring case.	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	browse/search: don't match strings in the hunk-header.	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	Browser: Support searching-again within the same line.	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	Browser: change searchdir to -1 or +1	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	Browser: Extend proper cursor tracking to search.	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	Browser: Use KEY_BACKSPACE to recognise a backspace.	commit \| commitdiff \| tree \| snapshot
2012-05-10	Neil Brown	Browser: add a more effective cursor.	commit \| commitdiff \| tree \| snapshot
2012-05-09	Neil Brown	browse: fix buffer underflow when closing directories.	commit \| commitdiff \| tree \| snapshot
2012-05-09	Neil Brown	Add another regression-test	commit \| commitdiff \| tree \| snapshot
2012-05-08	Neil Brown	Initial all of 'End' merger.	commit \| commitdiff \| tree \| snapshot
2012-05-08	Neil Brown	Avoid buffer overflow when checking for hunk header	commit \| commitdiff \| tree \| snapshot
2012-05-08	Neil Brown	merge: avoid including large Unmatched sections in...	commit \| commitdiff \| tree \| snapshot
2012-05-08	Neil Brown	Encourage more context into conflict reports.	commit \| commitdiff \| tree \| snapshot
2012-05-08	Neil Brown	merge: factor out is_cutpoint.	commit \| commitdiff \| tree \| snapshot
2012-05-08	Neil Brown	Improve handling of hunk-header when merging.	commit \| commitdiff \| tree \| snapshot
2012-05-08	Neil Brown	Ensure that a hunk-header never appears in the middle...	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	browser: clear the end of the split-window when needed.	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Add --show-wiggle flag.	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Handle some errors better in Browse mode.	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Make tracing code a bit cleaner and more organised.	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Introduce xmalloc and use it.	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Refactor do_diff slightly	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Better error message if split_patch fails for --extract	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Split do_diff_words and do_diff_lines out from do_diff	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Minor cleaning up in man page wiggle.1	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Remove extraction of base-name of command.	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Split do_merge out from main() as a separate function.	commit \| commitdiff \| tree \| snapshot
2012-05-07	Neil Brown	Split do_diff() out from main()	commit \| commitdiff \| tree \| snapshot
next

apply rejected patches and perform word-wise diffs

RSS Atom