Google Git
Sign in
googlers / jrn / git / e27ddb64568412b75035a05366c9f091153155ed / builtin / merge-file.c
  1. 82247e9 remove superfluous newlines in error messages by Pete Wyckoff · 13 years ago
  2. 20f84c8 Merge branch 'rs/opt-help-text' by Junio C Hamano · 14 years ago
  3. 8c83968 Describe various forms of "be quiet" using OPT__QUIET by Jonathan Nieder · 14 years ago
  4. d52ee6e add description parameter to OPT__QUIET by René Scharfe · 14 years ago
  5. 55846b9 merge-file: correctly find files when called in subdir by Thomas Rast · 14 years ago
  6. 3668d42 merge-file: run setup_git_directory_gently() sooner by Nguyễn Thái Ngọc Duy · 15 years ago
  7. 39b5977 Merge branch 'rs/diff-no-minimal' by Junio C Hamano · 15 years ago
  8. 4bb0936 merge-file --diff3: add a label for ancestor by Jonathan Nieder · 15 years ago
  9. a4b5e91 xdl_merge(): move file1 and file2 labels to xmparam structure by Jonathan Nieder · 15 years ago
  10. 2bb76e1 Merge branch 'bw/union-merge-refactor' by Junio C Hamano · 15 years ago
  11. 81b50f3 Move 'builtin-*' into a 'builtin/' subdirectory by Linus Torvalds · 15 years ago[Renamed from builtin-merge-file.c]
  12. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 15 years ago
  13. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
  14. 73eb40e git-merge-file --ours, --theirs by Junio C Hamano · 17 years ago
  15. 3778292 parse-opts: prepare for OPT_FILENAME by Stephen Boyd · 16 years ago
  16. 4deba8b merge-file: handle freopen() failure by René Scharfe · 16 years ago
  17. d249610 parse-opt: migrate builtin-merge-file. by Pierre Habouzit · 16 years ago
  18. b541248 merge.conflictstyle: choose between "merge" and "diff3 -m" styles by Junio C Hamano · 17 years ago
  19. 8313374 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less by Junio C Hamano · 17 years ago
  20. e0af48e xdiff-merge: optionally show conflicts in "diff3 -m" style by Junio C Hamano · 17 years ago
  21. 16007f3 Merge branch 'maint' by Junio C Hamano · 17 years ago
  22. 381b851 merge-file: handle empty files gracefully by Johannes Schindelin · 17 years ago
  23. ee95ec5 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM by Johannes Schindelin · 17 years ago
  24. baffc0e Make every builtin-*.c file #include "builtin.h" by Peter Hagervall · 18 years ago
  25. 5771907 git-merge-file: refuse to merge binary files by Johannes Schindelin · 18 years ago
  26. 7cab588 move read_mmfile() into xdiff-interface by Johannes Schindelin · 18 years ago
  27. fbe0b24 merge-file: support -p and -q; fix compile warnings by Johannes Schindelin · 18 years ago
  28. ba1f5f3 Add builtin merge-file, a minimal replacement for RCS merge by Johannes Schindelin · 18 years ago