Google Git
Sign in
googlers / jrn / git / 70d5dd1f71aab4b55bf3bc3e7f5031dc655c7fdf / t / t7600-merge.sh
  1. 016e5ff war on "sleep" in tests by Junio C Hamano · 15 years ago
  2. 1347483 Teach 'git merge' and 'git pull' the option --ff-only by Björn Gustavsson · 15 years ago
  3. 4f2d651 Merge branch 'mv/merge-noff' by Junio C Hamano · 16 years ago
  4. 46dc1b0 Merge branch 'maint' by Junio C Hamano · 16 years ago
  5. 4e6d4bc Add testcase to ensure merging an early part of a branch is done properly by Miklos Vajna · 16 years ago
  6. cf10f9f builtin-commit: use reduce_heads() only when appropriate by Miklos Vajna · 16 years ago
  7. 668f26f builtin-merge: refresh the index before calling a strategy by Miklos Vajna · 16 years ago
  8. 9b8ae93 Merge branch 'maint' by Junio C Hamano · 17 years ago
  9. 47a528a tests: use "git xyzzy" form (t7200 - t9001) by Nanako Shiraishi · 17 years ago
  10. a1184d8 Merge branch 'mv/merge-custom' by Junio C Hamano · 17 years ago
  11. 446247d merge: fix numerus bugs around "trivial merge" area by Junio C Hamano · 17 years ago
  12. 9ca8f60 "git-merge": allow fast-forwarding in a stat-dirty tree by Junio C Hamano · 17 years ago
  13. dce61e7 Add a second testcase for handling invalid strategies in git-merge by Miklos Vajna · 17 years ago
  14. 74f5b7f builtin-merge.c: Fix option parsing by Michele Ballabio · 17 years ago
  15. 588c038 Merge branch 'sb/dashless' by Junio C Hamano · 17 years ago
  16. 88bbda0 Merge branch 'maint' by Junio C Hamano · 17 years ago
  17. 01941bd t7600-merge: Use test_expect_failure to test option parsing by Johannes Sixt · 17 years ago
  18. 711f6b2 reduce_heads(): protect from duplicate input by Junio C Hamano · 17 years ago
  19. 3d1dd47 reduce_heads(): thinkofix by Sverre Hvammen Johansen · 17 years ago
  20. d492b31 t/: Use "test_must_fail git" instead of "! git" by Stephan Beyer · 17 years ago
  21. 4393c23 Teach merge.log to "git-merge" again by Junio C Hamano · 17 years ago
  22. efb779f merge, pull: add '--(no-)log' command line option by SZEDER Gábor · 17 years ago
  23. d8abe14 merge, pull: introduce '--(no-)stat' option by SZEDER Gábor · 17 years ago
  24. 82ebb0b add test_cmp function for test scripts by Jeff King · 17 years ago
  25. b4ce54f remove use of "tail -n 1" and "tail -1" by Jeff King · 17 years ago
  26. aadbe44 grep portability fix: don't use "-e" or "-q" by Jeff King · 17 years ago
  27. e6d1f76 git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options by Gerrit Pape · 17 years ago
  28. 7ee9066 t/t7600: avoid GNUism in grep by Junio C Hamano · 17 years ago
  29. d66424c git-merge: add --ff and --no-ff options by Lars Hjemli · 17 years ago
  30. d08af0a git-merge: add support for --commit and --no-squash by Lars Hjemli · 17 years ago
  31. aec7b36 git-merge: add support for branch.<name>.mergeoptions by Lars Hjemli · 17 years ago
  32. a85d1b6 Add test-script for git-merge porcelain by Lars Hjemli · 17 years ago