Google Git
Sign in
googlers / jrn / git / a0bba65b107651946431bee4c71d05d812988d9d / ll-merge.c
  1. 2aef63d attr: convert git_check_attrs() callers to use the new API by Junio C Hamano · 8 years ago
  2. 7bd1805 attr: rename function and struct related to checking attributes by Junio C Hamano · 8 years ago
  3. 243a7f0 Merge branch 'jc/ll-merge-internal' by Junio C Hamano · 9 years ago
  4. d694a17 ll-merge: use a longer conflict marker for internal merge by Junio C Hamano · 9 years ago
  5. ed34567 ll-merge: fix typo in comment by Junio C Hamano · 9 years ago
  6. 3733e69 use xmallocz to avoid size arithmetic by Jeff King · 9 years ago
  7. 7889179 Merge branch 'jk/war-on-sprintf' by Junio C Hamano · 9 years ago
  8. 11a458b Sync with 2.4.10 by Junio C Hamano · 9 years ago
  9. dcd1742 xdiff: reject files larger than ~1GB by Jeff King · 9 years ago
  10. 5096d49 convert trivial sprintf / strcpy calls to xsnprintf by Jeff King · 9 years ago
  11. ef45bb1 ll-merge: pass the original path to external drivers by Junio C Hamano · 10 years ago
  12. 6ea358f ll-merge.c: refactor `read_merge_config()` to use `git_config_string()` by Tanay Abhra · 11 years ago
  13. d731f0a convert some config callbacks to parse_config_key by Jeff King · 12 years ago
  14. e6d29a4 Merge branch 'jc/ll-merge-binary-ours' by Junio C Hamano · 12 years ago
  15. e0e2065 ll-merge: warn about inability to merge binary files only when we can't by Junio C Hamano · 13 years ago
  16. a944af1 merge: teach -Xours/-Xtheirs to binary ll-merge driver by Junio C Hamano · 13 years ago
  17. 82247e9 remove superfluous newlines in error messages by Pete Wyckoff · 13 years ago
  18. d932f4e Rename git_checkattr() to git_check_attr() by Michael Haggerty · 14 years ago
  19. 4fb40c2 ll-merge: simplify opts == NULL case by Jonathan Nieder · 14 years ago
  20. 58a1ece merge-recursive --patience by Justin Frankel · 15 years ago
  21. 712516b ll-merge: replace flag argument with options struct by Jonathan Nieder · 15 years ago
  22. 18b037a ll-merge: let caller decide whether to renormalize by Jonathan Nieder · 15 years ago
  23. 73cf7f7 ll-merge: make flag easier to populate by Jonathan Nieder · 15 years ago
  24. f217f0e Avoid conflicts when merging branches with mixed normalization by Eyvind Bernhardsen · 15 years ago
  25. 66dbfd5 Rewrite dynamic structure initializations to runtime assignment by Gary V. Vaughan · 15 years ago
  26. f01de62 ll_merge(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 15 years ago
  27. a4b5e91 xdl_merge(): move file1 and file2 labels to xmparam structure by Jonathan Nieder · 15 years ago
  28. 560119b refactor merge flags into xmparam_t by Bert Wesarg · 15 years ago
  29. cd1d61c make union merge an xdl merge favor by Bert Wesarg · 15 years ago
  30. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 15 years ago
  31. fcb2a7e Merge branch 'ap/merge-backend-opts' by Junio C Hamano · 15 years ago
  32. 8cc5b29 git merge -X<option> by Avery Pennarun · 15 years ago
  33. 8588567 rerere: honor conflict-marker-size attribute by Junio C Hamano · 15 years ago
  34. 23a64c9 conflict-marker-size: new attribute by Junio C Hamano · 15 years ago
  35. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
  36. 7fb0eaa git_attr(): fix function signature by Junio C Hamano · 15 years ago
  37. ac0ba18 run-command: convert simple callsites to use_shell by Jeff King · 15 years ago
  38. 08ac696 Merge branch 'js/run-command-updates' by Junio C Hamano · 16 years ago
  39. dd787c1 Merge branch 'tr/die_errno' by Junio C Hamano · 16 years ago
  40. 5709e03 run_command: return exit code as positive value by Johannes Sixt · 16 years ago
  41. 606475f Remove filename from conflict markers by Martin Renold · 16 years ago
  42. 0721c31 Use die_errno() instead of die() when checking syscalls by Thomas Rast · 16 years ago
  43. 09236d8 Merge branch 'sb/maint-1.6.0-add-config-fix' by Junio C Hamano · 16 years ago
  44. 90dce51 use xstrdup, not strdup in ll-merge.c by Jim Meyering · 16 years ago
  45. 0077138 Simplify some instances of run_command() by using run_command_v_opt(). by Johannes Sixt · 16 years ago
  46. 691f1a2 replace direct calls to unlink(2) with unlink_or_warn by Alex Riesen · 16 years ago
  47. ced621b merge-recursive: use strbuf_expand() instead of interpolate() by René Scharfe · 16 years ago
  48. c236bcd git-merge-recursive: learn to honor merge.conflictstyle by Junio C Hamano · 17 years ago
  49. ef90d6d Provide git_config with a callback-data parameter by Johannes Schindelin · 17 years ago
  50. 525ab63 merge-recursive: split low-level merge functions out. by Junio C Hamano · 17 years ago