index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
Commit message (
Expand
)
Author
Age
*
t6036: Add testcase for undetected conflict
Elijah Newren
2010-09-29
*
t6036: Add a second testcase similar to the first but with content changes
Elijah Newren
2010-09-29
*
t6036: Test index and worktree state, not just that merge fails
Elijah Newren
2010-09-29
*
t6020: Add a testcase for modify/delete + directory/file conflict
Elijah Newren
2010-09-29
*
t6020: Modernize style a bit
Elijah Newren
2010-09-29
*
t6022: Add tests for rename/rename combined with D/F conflicts
Elijah Newren
2010-09-29
*
t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
Elijah Newren
2010-09-29
*
t6022: Add tests with both rename source & dest involved in D/F conflicts
Elijah Newren
2010-09-29
*
t6022: Add tests for reversing order of merges when D/F conflicts present
Elijah Newren
2010-09-29
*
t6022: Add test combinations of {content conflict?, D/F conflict remains?}
Elijah Newren
2010-09-29
*
t6032: Add a test checking for excessive output from merge
Elijah Newren
2010-09-29
*
t3030: Add a testcase for resolvable rename/add conflict with symlinks
Schalk, Ken
2010-09-29
*
Merge branch 'en/rename-d-f' into en/merge-recursive
Junio C Hamano
2010-09-29
|
\
|
*
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
Elijah Newren
2010-09-09
|
*
t3509: Add rename + D/F conflict testcase that recursive strategy fails
Elijah Newren
2010-09-09
*
|
t/t7300: workaround ancient touch by rearranging arguments
Brandon Casey
2010-09-17
*
|
Merge branch 'bg/fix-t7003'
Junio C Hamano
2010-09-16
|
\
\
|
*
|
t7003: Use test_commit instead of custom function
Brian Gernhardt
2010-09-13
*
|
|
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
Junio C Hamano
2010-09-15
|
\
\
\
|
*
|
|
ls-tree $di $dir: do not mistakenly recurse into directories
Junio C Hamano
2010-09-12
*
|
|
|
Merge branch 'jl/fix-test'
Junio C Hamano
2010-09-15
|
\
\
\
\
|
*
|
|
|
t1020: Get rid of 'cd "$HERE"' at the start of each test
Jens Lehmann
2010-09-09
|
*
|
|
|
t2016 (checkout -p): add missing &&
Jonathan Nieder
2010-09-09
|
*
|
|
|
t1302 (core.repositoryversion): style tweaks
Jonathan Nieder
2010-09-09
|
*
|
|
|
t2105 (gitfile): add missing &&
Jonathan Nieder
2010-09-09
|
*
|
|
|
t1450 (fsck): remove dangling objects
Jonathan Nieder
2010-09-09
|
*
|
|
|
tests: subshell indentation stylefix
Jonathan Nieder
2010-09-09
|
*
|
|
|
Merge branch 'jl/maint-fix-test'
Junio C Hamano
2010-09-06
|
|
\
\
\
\
|
|
*
|
|
|
Several tests: cd inside subshell instead of around
Jens Lehmann
2010-09-06
|
|
|
/
/
/
*
|
|
|
|
Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
Junio C Hamano
2010-09-15
|
\
\
\
\
\
|
*
|
|
|
|
filter-branch: retire --remap-to-ancestor
Csaba Henk
2010-08-27
*
|
|
|
|
|
Merge branch 'ch/maint-cannot-create-bundle-error'
Junio C Hamano
2010-09-15
|
\
\
\
\
\
\
|
*
|
|
|
|
|
bundle: detect if bundle file cannot be created
Csaba Henk
2010-08-27
*
|
|
|
|
|
|
Merge branch 'ks/recursive-rename-add-identical'
Junio C Hamano
2010-09-15
|
\
\
\
\
\
\
\
|
|
_
|
_
|
_
|
_
|
/
/
|
/
|
|
|
|
|
|
|
*
|
|
|
|
|
RE: [PATCH] Avoid rename/add conflict when contents are identical
Schalk, Ken
2010-09-03
*
|
|
|
|
|
|
Merge branch 'maint'
Junio C Hamano
2010-09-12
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
t3101: modernise style
Junio C Hamano
2010-09-12
|
|
|
_
|
_
|
_
|
/
/
|
|
/
|
|
|
|
|
*
|
|
|
|
|
|
t/t4018: avoid two unnecessary sub-shell invocations
Brandon Casey
2010-09-10
*
|
|
|
|
|
|
t/t4018: test whether the word_regex patterns compile
Brandon Casey
2010-09-09
*
|
|
|
|
|
|
t/t5510-fetch.sh: improve testing with explicit URL and merge spec
Brandon Casey
2010-09-09
*
|
|
|
|
|
|
t/t7008: workaround broken handling of \000 by printf on IRIX
Brandon Casey
2010-09-09
|
|
_
|
_
|
_
|
_
|
/
|
/
|
|
|
|
|
*
|
|
|
|
|
Merge branch 'jk/test-must-fail-missing'
Junio C Hamano
2010-09-08
|
\
\
\
\
\
\
|
*
|
|
|
|
|
tests: make test_might_fail fail on missing commands
Jonathan Nieder
2010-08-31
|
*
|
|
|
|
|
tests: make test_might_fail more verbose
Jonathan Nieder
2010-08-31
|
*
|
|
|
|
|
tests: make test_must_fail fail on missing commands
Jeff King
2010-08-31
|
*
|
|
|
|
|
tests: make test_must_fail more verbose
Jeff King
2010-08-31
*
|
|
|
|
|
|
Merge branch 'jh/error-removing-missing-note'
Junio C Hamano
2010-09-08
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
notes: Don't create (empty) commit when removing non-existing notes
Johan Herland
2010-08-31
|
|
/
/
/
/
/
/
*
|
|
|
|
|
|
Merge branch 'bc/maint-fetch-url-only'
Junio C Hamano
2010-09-08
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
builtin/fetch.c: ignore merge config when not fetching from branch's remote
Brandon Casey
2010-08-25
[next]
