projects / org-merge-driver.git / shortlog
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
org-merge-driver.git
2012-08-18 Andrew YoungAdd test drivers master gsoc_pencil_down commit | commitdiff | tree | snapshot
2012-08-16 Andrew YoungAdd GPL License header to source files commit | commitdiff | tree | snapshot
2012-08-16 Andrew YoungAdd and fix test cases commit | commitdiff | tree | snapshot
2012-08-16 Andrew YoungStore relative heading level when parsing commit | commitdiff | tree | snapshot
2012-08-16 Andrew YoungFix insertion and deletion of children elements commit | commitdiff | tree | snapshot
2012-08-16 Andrew YoungAdd org_heading debug module commit | commitdiff | tree | snapshot
2012-08-14 Andrew YoungUpdate README commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungAdd gnulib and Flex generated files commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungClose input files before writing output commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungProperly return -1 on unresolved conflict commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungAdd a TAP driver and parallel test harness commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungAdd more test cases. commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungDisable debug printing commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungImplement beginning of cycle testing commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungImplement parsing of properties properties drawer commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungImplement new doc_elt interfaces commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungMove out print_ctxt to it's own source commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungFix issue with incorrect doc_elt_keys commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungImplement new isrelated and print strategies. commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungAdd functions to verify todos and priorities commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungImplement fwrite docstream wrapper commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungImplement merging of text using string_merge commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungImplement a line-by-line string merge algorithm commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungImplement org_property document element commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungAdd context sources to makefile commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungImplement argp interface and initialize contexts commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungWrite new contexts and interfaces commit | commitdiff | tree | snapshot
2012-08-13 Andrew YoungAdd private versions of gl_anytree to project commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungProperly initial merge contexts and merge in main commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungAdd global mapping interface to org_text commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungChange the token names in the parser commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungChange token names commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungAdd merge contexts to org_document commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungUpdate org_heading to use movement detection commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungFix bug in doc_reflist_merge commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungAdd a merge_context, ID keys, and a hook for global... commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungAdd reflection to elements commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungUpdate the src/Makefile.am commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungAdd search merger commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungAdd printing modules for smerger and listmerge commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungIgnore gnulib rbtree source files in Git commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungAdd doc/ automake file for future doc generation commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungImport gnulib's rbtree-list commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungHook merge rule tests into the automake TAP driver commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungUpdate the merge driver to not error with the new imple... commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungAdd preliminary merge rule checker commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungAdd doc folder to the automake path commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungMake Check an optional package commit | commitdiff | tree | snapshot
2012-08-01 Andrew YoungDelete unused test files in tests commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungUpdate main to use new elements commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungRemove unused data structures commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungUpdate lexer and parser to new element interface commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungUpdate org_text to use the new interfaces commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungUpdate org_heading element to use new interface commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungImplement org_document commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungImplement doc_elt support modules commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungDocument doc_stream commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungUpdate all doc_elt_ops operations commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungUpdate all doc_elt interfaces commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungUpdate the Makefile to include new sources commit | commitdiff | tree | snapshot
2012-07-27 Andrew YoungSet the default debug print level to 1 commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungAdd text as a property of org_heading commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungMake org_text a property of headings commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungFix typo in doc_merge.c commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungAdd map keys and map sets to merge_map commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungAdd support for printing conflict markers commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungMake merge_delta initialize child update to 0 commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungMake main initialize merge_print_ctxt commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungInitialize parents to NULL in an ltree commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungMake ancsestor not count children as updates commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungAdd map set and map keys to doc_elt_ops commit | commitdiff | tree | snapshot
2012-07-19 Andrew YoungAdd map keys and map sets to doc_elt commit | commitdiff | tree | snapshot
2012-07-13 Andrew YoungAdd new ops, get_key and get_type commit | commitdiff | tree | snapshot
2012-07-13 Andrew YoungReflect child updates to parent merge_node deltas commit | commitdiff | tree | snapshot
2012-07-13 Andrew YoungImplement doc_elt_compare for org_text commit | commitdiff | tree | snapshot
2012-07-13 Andrew YoungImplement doc_elt_compare in org_heading commit | commitdiff | tree | snapshot
2012-07-13 Andrew YoungChange smerge to merge in function name commit | commitdiff | tree | snapshot
2012-07-12 Andrew YoungAdd doc_elt_is_related, change doc_elt_compare commit | commitdiff | tree | snapshot
2012-07-12 Andrew YoungAdd note_child_update commit | commitdiff | tree | snapshot
2012-07-12 Andrew YoungFix interface for merge_delta commit | commitdiff | tree | snapshot
2012-07-12 Andrew Youngmerge_tree: automatically add parents commit | commitdiff | tree | snapshot
2012-07-12 Andrew YoungAdd child_update field to merge_delta commit | commitdiff | tree | snapshot
2012-07-12 Andrew Youngdoc_merge: moving matcing event to function commit | commitdiff | tree | snapshot
2012-07-12 Andrew YoungAdd debug print levels commit | commitdiff | tree | snapshot
2012-07-12 Andrew YoungAdd debug printing macros commit | commitdiff | tree | snapshot
2012-07-11 Andrew YoungModify doc_merge to work with new interfaces commit | commitdiff | tree | snapshot
2012-07-11 Andrew YoungAdd function to access specific children to dor_tree commit | commitdiff | tree | snapshot
2012-07-11 Andrew YoungAdd more interface functions for trees commit | commitdiff | tree | snapshot
2012-07-11 Andrew YoungAdd generic function for traverersing ltrees commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungRemove poorly placed assert in parser commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungAdd compilation instructions to README commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungUpdate todo and implementation notes commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungUpdate and add unit tests commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungChange the order project directories are built in commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungUpdate the makefile and main commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungAdd merge_print function commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungFix bug where map fields aren't set commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungAdd org parser commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungRewrite the entire lexer commit | commitdiff | tree | snapshot
2012-07-09 Andrew YoungFix org_text strings and implement print_merge commit | commitdiff | tree | snapshot
next
Org merge driver for dVCS like git