Google Git
Sign in
googlers / jrn / git / 3a238e539bcdfe3f9eb5010fd218640c1b499f7a / t / t4200-rerere.sh
  1. 0a41a89 Merge branch 'ma/test-quote-cleanup' by Junio C Hamano · 4 years, 7 months ago
  2. c76b84a t: don't spuriously close and reopen quotes by Martin Ågren · 4 years, 7 months ago
  3. e023ff0 t: remove test_oid_init in tests by brian m. carlson · 4 years, 7 months ago
  4. 717c939 t4200: make hash size independent by brian m. carlson · 5 years ago
  5. bd3941a Merge branch 'en/rerere-multi-stage-1-fix' by Junio C Hamano · 6 years ago
  6. 3900689 Merge branch 'tg/rerere' by Junio C Hamano · 6 years ago
  7. ad2bf0d rerere: avoid buffer overrun by Elijah Newren · 6 years ago
  8. 38c93c4 t4200: demonstrate rerere segfault on specially crafted merge by Elijah Newren · 6 years ago
  9. bd7dfa5 rerere: recalculate conflict ID when unresolved conflict is committed by Thomas Gummerer · 7 years ago
  10. 4af3220 rerere: teach rerere to handle nested conflicts by Thomas Gummerer · 7 years ago
  11. 93406a2 rerere: fix crash with files rerere can't handle by Thomas Gummerer · 7 years ago
  12. d3c6751 tests: make use of the test_must_be_empty function by Ævar Arnfjörð Bjarmason · 7 years ago
  13. 8125a58 t: switch $_z40 to $ZERO_OID by brian m. carlson · 7 years ago
  14. deb9845 Merge branch 'ps/test-chmtime-get' by Junio C Hamano · 7 years ago
  15. decf711 t/helper: 'test-chmtime (--get|-g)' to print only the mtime by Paul-Sebastian Ungureanu · 7 years ago
  16. 0e49649 t/helper: merge test-chmtime into test-tool by Nguyễn Thái Ngọc Duy · 7 years ago
  17. 6e96cb5 rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved by Junio C Hamano · 8 years ago
  18. e579aaa t4200: parameterize "rerere gc" custom expiry test by Junio C Hamano · 8 years ago
  19. 1ad8b47 t4200: gather "rerere gc" together by Junio C Hamano · 8 years ago
  20. c277344 t4200: make "rerere gc" test more robust by Junio C Hamano · 8 years ago
  21. 780fbeb t4200: give us a clean slate after "rerere gc" tests by Junio C Hamano · 8 years ago
  22. 890fca8 rerere: adjust 'forget' to multi-variant world order by Junio C Hamano · 9 years ago
  23. 1be1e85 rerere: gc and clear by Junio C Hamano · 9 years ago
  24. 629716d rerere: do use multiple variants by Junio C Hamano · 10 years ago
  25. 82efa6e t4200: rerere a merge with two identical conflicts by Junio C Hamano · 10 years ago
  26. 05dd9f1 rerere: handle leftover rr-cache/$ID directory and postimage files by Junio C Hamano · 10 years ago
  27. 152a9c1 Merge branch 'fc/trivial' by Junio C Hamano · 11 years ago
  28. 501a75a t: replace pulls with merges by Felipe Contreras · 11 years ago
  29. 94221d2 t: use perl instead of "$PERL_PATH" where applicable by Jeff King · 11 years ago
  30. 9a00138 Fix tests under GETTEXT_POISON on parseopt by Jiang Xin · 13 years ago
  31. 7096b64 tests: enclose $PERL_PATH in double quotes by Junio C Hamano · 13 years ago
  32. a342820 t: Replace 'perl' by $PERL_PATH by Vincent van Ravesteijn · 13 years ago
  33. 8aed4a5 Merge branch 'jn/merge-renormalize' by Junio C Hamano · 15 years ago
  34. 672d1b7 rerere: migrate to parse-options API by Jonathan Nieder · 15 years ago
  35. f731488 t4200 (rerere): modernize style by Jonathan Nieder · 15 years ago
  36. 7d7ff15 rerere: fix overeager gc by SZEDER Gábor · 15 years ago
  37. 4a45f7d Use test_expect_success for test setups by Brian Gernhardt · 15 years ago
  38. cb6020b Teach --[no-]rerere-autoupdate option to merge, revert and friends by Junio C Hamano · 15 years ago
  39. 5e16488 t4200: convert sed expression which operates on non-text file to perl by Brandon Casey · 16 years ago
  40. 9eda0e9 t4200: remove two unnecessary lines by Brandon Casey · 16 years ago
  41. 588c038 Merge branch 'sb/dashless' by Junio C Hamano · 17 years ago
  42. d492b31 t/: Use "test_must_fail git" instead of "! git" by Stephan Beyer · 17 years ago
  43. 0af0ac7 Move MERGE_RR from .git/rr-cache/ into .git/ by Johannes Schindelin · 17 years ago
  44. 99d698f builtin-rerere: more carefully find conflict markers by Olivier Marin · 17 years ago
  45. 121c813 rerere.autoupdate by Junio C Hamano · 17 years ago
  46. 7f8365f t4200: fix rerere test by Junio C Hamano · 17 years ago
  47. 3af8286 tests: do not use implicit "git diff --no-index" by Junio C Hamano · 17 years ago
  48. e85fe4d more tr portability test script fixes by Jeff King · 17 years ago
  49. 3175b0c the use of 'tr' in the test suite isn't really portable by H.Merijn Brand · 17 years ago
  50. 52aaf64 rerere: record resolution even if file is not in merge base by Johannes Schindelin · 18 years ago
  51. b4372ef Enable "git rerere" by the config variable rerere.enabled by Johannes Schindelin · 18 years ago
  52. 5be6007 Rewrite "git-frotz" to "git frotz" by Junio C Hamano · 18 years ago
  53. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  54. c256acb posix compatibility for t4200 by Bryan Larsen · 18 years ago
  55. 2b93edb rerere: make sorting really stable. by Junio C Hamano · 18 years ago
  56. 364b852 Fix t4200-rerere for white-space from "wc -l" by Brian Gernhardt · 18 years ago
  57. 045f575 Merge 1.5.0.7 in by Junio C Hamano · 18 years ago
  58. eb33596 rerere should not repeat the earlier hunks in later ones by Junio C Hamano · 18 years ago
  59. 5bd7450 Get rid of the dependency to GNU diff in the tests by Johannes Schindelin · 18 years ago
  60. 56cf980 Update tests to use test-chmtime by Eric Wong · 18 years ago
  61. fa1b4d2 t4200: skip gc-rerere test on systems with non GNU date. by Junio C Hamano · 18 years ago
  62. 4700951 Use standard -t option for touch. by Simon 'corecode' Schubert · 18 years ago
  63. ad8e72c Add a test for git-rerere by Johannes Schindelin · 18 years ago