Andrew's git - gitweb.git/history - t/t6042-merge-rename-corner-cases.sh

[gitweb.git] / t / t6042-merge-rename-corner-cases.sh

2011-10-12	Merge branch 'zj/send-email-authen-sasl'	blob \| diff \| raw
2011-10-10	Merge branch 'dm/tree-walk'	blob \| diff \| raw
2011-10-10	Merge branch 'ps/gitweb-js-with-lineno'	blob \| diff \| raw
2011-10-10	Merge branch 'mh/maint-notes-merge-pathbuf-fix'	blob \| diff \| raw
2011-10-10	Merge branch 'nd/sparse-doc'	blob \| diff \| raw
2011-10-10	Merge branch 'jp/get-ref-dir-unsorted'	blob \| diff \| raw
2011-10-10	Merge branch 'jm/mergetool-pathspec'	blob \| diff \| raw
2011-10-10	Merge branch 'jc/maint-diffstat-numstat-context'	blob \| diff \| raw
2011-10-10	Merge branch 'mh/iterate-refs'	blob \| diff \| raw
2011-10-10	Merge branch 'mz/remote-rename'	blob \| diff \| raw
2011-10-10	Merge branch 'cb/common-prefix-unification'	blob \| diff \| raw
2011-10-10	Merge branch 'jn/maint-http-error-message'	blob \| diff \| raw
2011-10-10	Merge branch 'hv/submodule-update-none'	blob \| diff \| raw
2011-10-10	Merge branch 'fg/submodule-git-file-git-dir'	blob \| diff \| raw
2011-10-09	Makefile: fix permissions of mergetools/ checked out...	blob \| diff \| raw
2011-10-07	Merge branch 'js/maint-no-cherry-pick-head-after-punted...	blob \| diff \| raw
2011-10-05	Merge branch 'mm/mediawiki-as-a-remote'	blob \| diff \| raw
2011-10-05	Merge branch 'rj/maint-t9159-svn-rev-notation'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/ls-remote-short-help'	blob \| diff \| raw
2011-10-05	Merge branch 'sn/doc-update-index-assume-unchanged'	blob \| diff \| raw
2011-10-05	Merge branch 'mg/maint-doc-sparse-checkout'	blob \| diff \| raw
2011-10-05	Merge branch 'jk/argv-array'	blob \| diff \| raw
2011-10-05	Merge branch 'tr/doc-note-rewrite'	blob \| diff \| raw
2011-10-05	Merge branch 'mg/branch-list'	blob \| diff \| raw
2011-10-05	Merge branch 'cb/send-email-help'	blob \| diff \| raw
2011-10-05	Merge branch 'fk/use-kwset-pickaxe-grep-f'	blob \| diff \| raw
2011-10-05	Merge branch 'jk/for-each-ref'	blob \| diff \| raw
2011-10-05	Merge branch 'wh/normalize-alt-odb-path'	blob \| diff \| raw
2011-10-05	Merge branch 'hl/iso8601-more-zone-formats'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/receive-verify'	blob \| diff \| raw
2011-10-05	Merge branch 'rj/quietly-create-dep-dir'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/fetch-verify'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/fetch-pack-fsck-objects'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/traverse-commit-list'	blob \| diff \| raw
2011-10-05	Merge branch 'rr/revert-cherry-pick-continue'	blob \| diff \| raw
2011-10-05	Merge branch 'da/make-auto-header-dependencies'	blob \| diff \| raw
2011-10-05	Merge branch 'gb/am-hg-patch'	blob \| diff \| raw
2011-10-05	Merge branch 'bc/unstash-clean-crufts'	blob \| diff \| raw
2011-10-05	Merge branch 'fk/make-auto-header-dependencies'	blob \| diff \| raw
2011-10-05	Merge branch 'ms/patch-id-with-overlong-line'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/maint-bundle-too-quiet'	blob \| diff \| raw
2011-10-05	Merge branch 'jk/filter-branch-require-clean-work-tree'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/want-commit'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/maint-fsck-fwrite-size-check'	blob \| diff \| raw
2011-10-05	Merge branch 'bk/ancestry-path'	blob \| diff \| raw
2011-10-05	Merge branch 'jk/maint-fetch-submodule-check-fix'	blob \| diff \| raw
2011-10-05	Merge branch 'tr/mergetool-valgrind'	blob \| diff \| raw
2011-10-05	Merge branch 'nm/grep-object-sha1-lock'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/diff-index-unpack'	blob \| diff \| raw
2011-10-05	Merge branch 'mm/rebase-i-exec-edit'	blob \| diff \| raw
2011-10-05	Merge branch 'jc/maint-grep-untracked-exclude' into...	blob \| diff \| raw
2011-09-26	Merge branch 'jc/namespace-doc-with-old-asciidoc'	blob \| diff \| raw
2011-09-23	Merge 1.7.6.4 in	blob \| diff \| raw
2011-09-22	Merge branch 'bk/ancestry-path' into jc/branch-desc	blob \| diff \| raw
2011-09-20	Merge branch 'maint'	blob \| diff \| raw
2011-09-19	Merge branch 'ph/format-patch-no-color'	blob \| diff \| raw
2011-09-17	Merge branch 'ci/forbid-unwanted-current-branch-update'	blob \| diff \| raw
2011-09-15	Merge branch 'ph/format-patch-no-color'	blob \| diff \| raw
2011-09-12	Sync with 1.7.6.3	blob \| diff \| raw
2011-09-12	Merge branch 'jn/remote-helpers-doc'	blob \| diff \| raw
2011-09-12	Merge branch 'maint'	blob \| diff \| raw
2011-09-06	Merge branch 'rc/histogram-diff'	blob \| diff \| raw
2011-09-06	Merge branch 'cb/maint-ls-files-error-report'	blob \| diff \| raw
2011-09-06	Merge branch 'mh/check-ref-format-print-normalize'	blob \| diff \| raw
2011-09-06	Sync with 1.7.6.2	blob \| diff \| raw
2011-09-02	Merge branch 'js/i18n-scripts-2'	blob \| diff \| raw
2011-09-02	Merge branch 'tr/maint-t3903-misquoted-command'	blob \| diff \| raw
2011-09-02	Merge branch 'bc/bisect-test-use-shell-path'	blob \| diff \| raw
2011-09-02	Merge branch 'va/p4-branch-import-test-update'	blob \| diff \| raw
2011-09-02	Merge branch 'tr/maint-strbuf-grow-nul-termination'	blob \| diff \| raw
2011-09-02	Merge branch 'tr/maint-ident-to-git-memmove'	blob \| diff \| raw
2011-09-02	Merge branch 'tr/maint-format-patch-empty-output'	blob \| diff \| raw
2011-09-02	Merge branch 'gb/maint-am-stgit-author-to-from-fix'	blob \| diff \| raw
2011-09-02	Merge branch 'gb/maint-am-patch-format-error-message'	blob \| diff \| raw
2011-09-02	Merge branch 'ms/daemon-timeout-is-in-seconds'	blob \| diff \| raw
2011-09-02	Merge branch 'bg/t5540-osx-grep'	blob \| diff \| raw
2011-09-02	Merge branch 'jc/clean-exclude-doc'	blob \| diff \| raw
2011-09-02	Merge branch 'mg/maint-notes-C-doc'	blob \| diff \| raw
2011-09-02	Merge branch 'fg/submodule-ff-check-before-push'	blob \| diff \| raw
2011-09-02	Merge branch 'rc/diff-cleanup-records'	blob \| diff \| raw
2011-09-02	Merge branch 'fk/use-kwset-pickaxe-grep-f'	blob \| diff \| raw
2011-09-02	Merge branch 'en/merge-recursive-2'	blob \| diff \| raw
2011-08-14	merge-recursive: Fix working copy handling for rename...	blob \| diff \| raw
2011-08-14	merge-recursive: add handling for rename/rename/add...	blob \| diff \| raw \| diff to current
2011-08-14	merge-recursive: Consider modifications in rename/renam...	blob \| diff \| raw \| diff to current
2011-08-14	merge-recursive: Provide more info in conflict markers...	blob \| diff \| raw \| diff to current
2011-08-14	merge-recursive: Improve handling of rename target...	blob \| diff \| raw \| diff to current
2011-08-14	merge-recursive: Fix deletion of untracked file in...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add failing testcases for rename/rename/add...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Ensure rename/rename conflicts leave index and...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add tests for content issues with modify/rename...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add a testcase where undetected rename causes...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add a pair of cases where undetected renames...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add failing testcase for rename/modify/add-sourc...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add a testcase where git deletes an untracked...	blob \| diff \| raw \| diff to current