5182 Commits (0b35deb378ee471f64e1b376d722e0bdd97d5e36)

Author SHA1 Message Date
Elijah Newren 0b35deb378 t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify 14 years ago
Elijah Newren a0d3311624 t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify 14 years ago
Elijah Newren 827f2b7d29 t6036: tests for criss-cross merges with various directory/file conflicts 14 years ago
Elijah Newren 96b079e5c9 t6036: criss-cross with weird content can fool git into clean merge 14 years ago
Elijah Newren fe7e9c23e4 t6036: Add differently resolved modify/delete conflict in criss-cross test 14 years ago
Elijah Newren c6966068fb t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts 14 years ago
Elijah Newren f0b75fcc81 t6042: Ensure rename/rename conflicts leave index and workdir in sane state 14 years ago
Elijah Newren ac6e839241 t6042: Add tests for content issues with modify/rename/directory conflicts 14 years ago
Elijah Newren a0551f212e t6042: Add a testcase where undetected rename causes silent file deletion 14 years ago
Elijah Newren 7b4ed5941c t6042: Add a pair of cases where undetected renames cause issues 14 years ago
Elijah Newren 58040239f5 t6042: Add failing testcase for rename/modify/add-source conflict 14 years ago
Elijah Newren 695576fddd t6042: Add a testcase where git deletes an untracked file 14 years ago
Nguyen Thai Ngoc Duy 09ffc706e4 init/clone: remove short option -L and document --separate-git-dir 14 years ago
Junio C Hamano 73546c085d handle_options(): do not miscount how many arguments were used 14 years ago
Jeff King 06eb708f33 config: always parse GIT_CONFIG_PARAMETERS during git_config 14 years ago
Jim Meyering 42536dd9b9 do not read beyond end of malloc'd buffer 14 years ago
Michael J Gruber 9963e025e8 git-svn: Fix git svn log --show-commit 14 years ago
Jeff King c7730e6f5f test core.gitproxy configuration 14 years ago
Jeff King e9fe74cba4 t3503: test cherry picking and reverting root commits 14 years ago
Johan Herland ebe8621fd7 t5400: Fix a couple of typos 14 years ago
Junio C Hamano 4da5af3151 setup_revisions(): take pathspec from command line and --stdin correctly 14 years ago
Junio C Hamano 365c2aaafc t1507: avoid "${parameter<op>'word'}" inside double-quotes 14 years ago
Junio C Hamano 0bf9fc0cd2 t3701: add-p-fix makes the last test to pass 14 years ago
Junio C Hamano 0d8fc3efc6 merge: make branch.<name>.mergeoptions correctly override merge.<option> 14 years ago
Junio C Hamano 8fe6177ac6 t3701: fix here document 14 years ago
Brian Gernhardt c01bd5a29f t/annotate-tests: Use echo & cat instead of sed 14 years ago
Jeff King 6aaeca900b merge-one-file: fix broken merges with alternate work trees 14 years ago
Jeff King cf1af1b1f3 add tests for merge-index / merge-one-file 14 years ago
Junio C Hamano f3217e2b17 t3701: Editing a split hunk in an "add -p" session 14 years ago
Josh Stone 9b01f0038b blame: tolerate bogus e-mail addresses a bit better 14 years ago
Andrew Wong c192f9c865 git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff 14 years ago
Jeff King 4d03c18a3e pretty: quote rfc822 specials in email addresses 14 years ago
Mathias Lafeldt 72942a617c t/README: unify documentation of test function args 14 years ago
Junio C Hamano 75973b2cb5 Fix "add -u" that sometimes fails to resolve unmerged paths 14 years ago
Junio C Hamano 095ce9538b diff-files: show unmerged entries correctly 14 years ago
Junio C Hamano 3749fde561 test: use $_z40 from test-lib 14 years ago
Michael J Gruber f1e9c548ce date: avoid "X years, 12 months" in relative dates 14 years ago
Jonathan Nieder c0f19bf3b9 tests: check error message from run_command 14 years ago
Junio C Hamano c9ea118e75 i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 14 years ago
Junio C Hamano cc6658e7b4 i18n: use test_i18n{grep,cmp} in t7508 14 years ago
Junio C Hamano 7a23d2d28a i18n: use test_i18ngrep in t7506 14 years ago
Michael J Gruber e3b02bc953 t3306,t5304: avoid clock skew issues 14 years ago
Junio C Hamano f79ce8dbe5 i18n: use test_i18ngrep and test_i18ncmp in t7502 14 years ago
Junio C Hamano 32177ba663 i18n: use test_i18ngrep in t7501 14 years ago
Junio C Hamano 29853c8242 i18n: use test_i18ncmp in t7500 14 years ago
Junio C Hamano 69382976aa i18n: use test_i18ngrep in t7201 14 years ago
Junio C Hamano 476cca692c i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 14 years ago
Junio C Hamano b3e1900a74 i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060 14 years ago
Junio C Hamano 68b2a0055c i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 14 years ago
Junio C Hamano fff1bb3a34 i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 14 years ago