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

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

2013-08-19	NeilBrown	merge: fix another bug in isolate_conflicts. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-08-19	NeilBrown	vpatch: discard 'ignored' for 'oldtype'. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-08-19	NeilBrown	merge: fix reporting of empty "conflicts". Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-08-19	NeilBrown	tests: new test case for stray &&&&& Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-08-19	NeilBrown	Browser: Don't highlight spaces so much. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-08-19	NeilBrown	Unwrap some printf string. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-08-19	NeilBrown	Browser help: add some missing commas. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-28	NeilBrown	Extract version information from 'git' if possible. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-22	NeilBrown	merge: be more careful about aligning hunk-headers... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-22	NeilBrown	csl_join should merge adjacent matches. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-08	NeilBrown	merge: calculate number of wiggles more accurately. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-08	NeilBrown	merge: tidy up isolation of conflicts. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-08	NeilBrown	vpatch: restore display for hunk header where appropriate. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-05	NeilBrown	Add --ignore-blanks option. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-01	NeilBrown	vpatch: allow a word to have text before the newline. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-01	NeilBrown	Allow a word to have an unmatched prefix and suffix. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-01	NeilBrown	discard ends_mline, just use ends_line Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-01	NeilBrown	vpatch: restructure draw_mside. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-01	NeilBrown	Remove duplicate definition of "csl_join" Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-03-01	NeilBrown	merge: Remove noise from --show-wiggles output. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-20	NeilBrown	vpatch: fix browse of three-file merge. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-19	NeilBrown	tests: add 'merge' test for linux/raid5 Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-14	NeilBrown	Add valgrind testing of parts of vpatch. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-14	NeilBrown	Add "make valgrind" Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-14	NeilBrown	merge: remove some meaningless AlreadyApplied Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-14	NeilBrown	bestmatch: improve poor matches. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-13	NeilBrown	merge: remove useless context from the end of a conflict. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-13	NeilBrown	merge: remove useless context at the start of a conflict. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-13	NeilBrown	vpatch: fix another access-beyond-array Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-12	NeilBrown	vpatch: allow relevant signals to cause a core-dump.	commit \| commitdiff \| tree
2013-02-12	NeilBrown	vpatch: fix various reference errors found by valgrind. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-07	NeilBrown	Browser: add missing documentation for Save and Restore... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-06	NeilBrown	diff: make rediffing of patches more precise. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2013-02-04	NeilBrown	DOC: remove diff.ps due to distribution license issues. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	vpatch: add mouse movement to merge_window. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	vpatch: add mouse support for main window. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	Man page updates. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	vpatch: allow control-C to disable --replace function. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	vpatch: handle --replace option. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	vpatch: add X command to ignore all changes in the... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	vpatch: make sure render is stable when the merge is... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	vpatch: allow changes to be ignored as well as conflict. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	vpatch: fix display for ignored conflicts. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-15	NeilBrown	vpatch: add "control-X-O" as a watch to change panes. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: allow mode setting keys to toggle back to ... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: change appearance of ignored conflicts. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: update status counters when we save a file. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: add 'C' command to go to next conflicted hunk. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: highlight conflicts better. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: update display correctly when editing the merge. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: conditionally auto-save unsaved files when... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: avoid repeated backups. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: prompt to save change if merge was editted. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: allow a save file to be restored. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: support saving of files. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: Allow a message to be displayed in main folder. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	Separate make_merger out from print_merge2 Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-14	NeilBrown	vpatch: remove lots of memory leaks. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-13	NeilBrown	vpatch: allow a file in list to be a 'merger' instead... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-13	NeilBrown	vpatch: allow conflict to be ignored with 'x'	commit \| commitdiff \| tree
2012-11-13	NeilBrown	vpatch: change args to visible() Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-13	NeilBrown	vpatch: avoid extra blanks when cursor is in alternate... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-13	NeilBrown	vpatch: add 'space' and 'backspace' for page up/down. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-13	NeilBrown	vpatch: highlight spaces when they might be important. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-13	NeilBrown	vpatch: make ctrl-G search-again-forward, not just... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-13	NeilBrown	vpatch: fix check_line to stop at hunk headers. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-12	NeilBrown	vpatch: ensure searching for 'next change' works. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-12	NeilBrown	vpatch: revise the exact meaning of 'CHANGES'. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-12	NeilBrown	vpatch: remove CHANGED Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-11	NeilBrown	Browse: ensure we erase all of old type name when updating... Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-11-11	NeilBrown	Browse: git problem in rendering file list. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-05-17	NeilBrown	vpatch - use 'cols' in main window. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-05-17	NeilBrown	config.h: include different endian file for OS/X Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-05-17	NeilBrown	extract: removed unused variable: lineno Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-05-15	NeilBrown	merge: make some conflicts less conflicting. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree
2012-05-15	NeilBrown	Browser: fix in_conflict detection while browsing. Signed-off-by: NeilBrown <neilb@suse.de>	commit \| commitdiff \| tree

apply rejected patches and perform word-wise diffs

RSS Atom