Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
conflict_rename_delete(): Check whether D/F conflicts are still present
[gitweb.git]
/
t
/
2010-09-30
conflict_rename_delete(): Check whether D/F conflicts...
tree
|
diff
2010-09-30
merge-recursive: Delay content merging for renames
tree
|
diff
2010-09-30
merge-recursive: Move handling of double rename of...
tree
|
diff
2010-09-30
merge-recursive: Avoid doubly merging rename/add confli...
tree
|
diff
2010-09-30
t6036: Add testcase for undetected conflict
tree
|
diff
2010-09-30
t6036: Add a second testcase similar to the first but...
tree
|
diff
2010-09-30
t6036: Test index and worktree state, not just that...
tree
|
diff
2010-09-30
t6020: Add a testcase for modify/delete + directory...
tree
|
diff
2010-09-30
t6020: Modernize style a bit
tree
|
diff
2010-09-30
t6022: Add tests for rename/rename combined with D...
tree
|
diff
2010-09-30
t6022: Add paired rename+D/F conflict: (two/file, one...
tree
|
diff
2010-09-30
t6022: Add tests with both rename source & dest involve...
tree
|
diff
2010-09-30
t6022: Add tests for reversing order of merges when...
tree
|
diff
2010-09-30
t6022: Add test combinations of {content conflict?...
tree
|
diff
2010-09-30
t6032: Add a test checking for excessive output from...
tree
|
diff
2010-09-30
t3030: Add a testcase for resolvable rename/add conflic...
tree
|
diff
2010-09-30
Merge branch 'en/rename-d-f' into en/merge-recursive
tree
|
diff
2010-09-18
Merge branch 'js/ls-files-x-doc'
tree
|
diff
2010-09-17
t/t7300: workaround ancient touch by rearranging arguments
tree
|
diff
2010-09-16
Merge branch 'bg/fix-t7003'
tree
|
diff
2010-09-15
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
tree
|
diff
2010-09-15
Merge branch 'os/fix-rebase-diff-no-prefix'
tree
|
diff
2010-09-15
Merge branch 'jl/fix-test'
tree
|
diff
2010-09-15
Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
tree
|
diff
2010-09-15
Merge branch 'ch/maint-cannot-create-bundle-error'
tree
|
diff
2010-09-15
Merge branch 'ks/recursive-rename-add-identical'
tree
|
diff
2010-09-15
Merge git://repo.or.cz/git-gui
tree
|
diff
2010-09-13
t7003: Use test_commit instead of custom function
tree
|
diff
2010-09-12
Merge branch 'maint'
tree
|
diff
2010-09-12
ls-tree $di $dir: do not mistakenly recurse into direct...
tree
|
diff
2010-09-12
t3101: modernise style
tree
|
diff
2010-09-10
Merge branch 'np/relnotes-in-subdir'
tree
|
diff
2010-09-10
Merge branch 'maint'
tree
|
diff
2010-09-10
t/t4018: avoid two unnecessary sub-shell invocations
tree
|
diff
2010-09-10
Merge branch 'maint'
tree
|
diff
2010-09-10
t/t4018: test whether the word_regex patterns compile
tree
|
diff
2010-09-10
t/t5510-fetch.sh: improve testing with explicit URL...
tree
|
diff
2010-09-10
t/t7008: workaround broken handling of \000 by printf...
tree
|
diff
2010-09-10
merge-recursive: D/F conflicts where was_a_dir/file...
tree
|
diff
2010-09-10
t3509: Add rename + D/F conflict testcase that recursiv...
tree
|
diff
2010-09-09
t1020: Get rid of 'cd "$HERE"' at the start of each...
tree
|
diff
2010-09-09
t2016 (checkout -p): add missing &&
tree
|
diff
2010-09-09
t1302 (core.repositoryversion): style tweaks
tree
|
diff
2010-09-09
t2105 (gitfile): add missing &&
tree
|
diff
2010-09-09
t1450 (fsck): remove dangling objects
tree
|
diff
2010-09-09
tests: subshell indentation stylefix
tree
|
diff
2010-09-08
Merge branch 'tf/cleanup-builtin-help-headers'
tree
|
diff
2010-09-08
Merge branch 'jk/test-must-fail-missing'
tree
|
diff
2010-09-08
Merge branch 'jh/error-removing-missing-note'
tree
|
diff
2010-09-08
Merge branch 'kf/askpass-config'
tree
|
diff
2010-09-08
Merge branch 'bc/maint-fetch-url-only'
tree
|
diff
2010-09-08
Merge branch 'jk/maint-pass-c-config-in-env'
tree
|
diff
2010-09-08
Merge branch 'en/d-f-conflict-fix'
tree
|
diff
2010-09-07
Merge branch 'maint'
tree
|
diff
2010-09-06
Merge branch 'jh/clean-exclude'
tree
|
diff
2010-09-06
Merge branch 'jl/maint-fix-test'
tree
|
diff
2010-09-06
Several tests: cd inside subshell instead of around
tree
|
diff
2010-09-06
t3404 & t7508: cd inside subshell instead of around
tree
|
diff
2010-09-06
Merge branch 'maint'
v1.7.3-rc0
tree
|
diff
2010-09-06
Merge branch 'xx/trivial' into maint
tree
|
diff
2010-09-06
t5505: add missing &&
tree
|
diff
2010-09-04
Merge branch 'jl/submodule-ignore-diff'
tree
|
diff
2010-09-04
Merge branch 'ab/test-2'
tree
|
diff
2010-09-04
Merge branch 'js/detached-stash'
tree
|
diff
2010-09-04
Merge branch 'js/maint-reflog-beyond-horizon'
tree
|
diff
2010-09-04
Merge branch 'dg/local-mod-error-messages'
tree
|
diff
2010-09-04
Merge branch 'nd/maint-fix-replace'
tree
|
diff
2010-09-04
parse_object: pass on the original sha1, not the replac...
tree
|
diff
2010-09-03
RE: [PATCH] Avoid rename/add conflict when contents...
tree
|
diff
2010-09-03
Merge branch 'ab/compat-regex'
tree
|
diff
2010-09-03
Merge branch 'nd/clone-depth-zero'
tree
|
diff
2010-09-03
Merge branch 'jn/maint-doc-user-manual-html-doctype'
tree
|
diff
2010-09-03
Merge branch 'cb/maint-mergetool-no-tty'
tree
|
diff
2010-09-03
Merge branch 'jn/apply-filename-with-sp'
tree
|
diff
2010-09-03
Merge branch 'jn/merge-custom-no-trivial'
tree
|
diff
2010-09-03
Merge branch 'jc/maint-doc-em-dash'
tree
|
diff
2010-09-03
Merge branch 'mg/doc-bundle'
tree
|
diff
2010-09-03
Merge branch 'jn/doc-backslash'
tree
|
diff
2010-09-03
Merge branch 'jn/update-contrib-example-merge'
tree
|
diff
2010-09-03
Merge branch 'jn/merge-renormalize'
tree
|
diff
2010-09-03
Sync with 1.7.2.3
tree
|
diff
2010-09-03
t7406 & t7407: add missing && at end of lines
tree
|
diff
2010-09-03
t7405: cd inside subshell instead of around
tree
|
diff
2010-09-03
t7609-merge-co-error-msgs: test non-fast forward case...
tree
|
diff
2010-09-01
Merge branch 'maint'
tree
|
diff
2010-09-01
Merge branch 'gp/pack-refs-remove-empty-dirs' into...
tree
|
diff
2010-09-01
Merge branch 'sg/rerere-gc-old-still-used' into maint
tree
|
diff
2010-09-01
Merge branch 'np/maint-huge-delta-generation' into...
tree
|
diff
2010-09-01
Merge branch 'dj/fetch-tagopt' into maint
tree
|
diff
2010-09-01
Merge branch 'da/fix-submodule-sync-superproject-config...
tree
|
diff
2010-09-01
Merge branch 'en/rebase-against-rebase-fix' into maint
tree
|
diff
2010-08-31
Merge branch 'np/maint-huge-delta-generation'
tree
|
diff
2010-08-31
Merge branch 'da/fix-submodule-sync-superproject-config'
tree
|
diff
2010-08-31
Merge branch 'jn/cherry-revert-message-clean-up'
tree
|
diff
2010-08-31
Merge branch 'cb/binary-patch-id'
tree
|
diff
2010-08-31
Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
tree
|
diff
2010-08-31
Merge branch 'dj/fetch-tagopt'
tree
|
diff
2010-08-31
Merge branch 'en/d-f-conflict-fix'
tree
|
diff
2010-08-31
Merge branch 'jn/svn-fe'
tree
|
diff
2010-08-31
Merge branch 'tr/maint-no-unquote-plus'
tree
|
diff
next