Andrew's git - gitweb.git/history - t/t6022-merge-rename.sh

[gitweb.git] / t / t6022-merge-rename.sh

2010-11-30	Merge branch 'jl/add-p-reverse-message'	blob \| diff \| raw
2010-11-30	Merge branch 'np/pack-broken-boundary'	blob \| diff \| raw
2010-11-30	Merge branch 'np/diff-in-corrupt-repository'	blob \| diff \| raw
2010-11-30	Merge branch 'fc/apply-p2-get-header-name'	blob \| diff \| raw
2010-11-30	Merge branch 'jn/fast-import-fix'	blob \| diff \| raw
2010-11-30	Merge branch 'rr/needs-clean-work-tree'	blob \| diff \| raw
2010-11-30	Merge branch 'kb/blame-author-email'	blob \| diff \| raw
2010-11-30	Merge branch 'cm/diff-check-at-eol'	blob \| diff \| raw
2010-11-30	Merge branch 'ak/apply-non-git-epoch'	blob \| diff \| raw
2010-11-30	Merge branch 'tc/smart-http-post-redirect'	blob \| diff \| raw
2010-11-24	Merge branch 'cb/maint-orphan-merge-noclobber'	blob \| diff \| raw
2010-11-24	Merge branch 'ao/send-email-irt'	blob \| diff \| raw
2010-11-24	Merge branch 'jk/add-e-doc'	blob \| diff \| raw
2010-11-24	Merge branch 'rs/opt-help-text'	blob \| diff \| raw
2010-11-24	Merge branch 'kb/maint-rebase-autosquash'	blob \| diff \| raw
2010-11-24	Merge branch 'mm/phrase-remote-tracking'	blob \| diff \| raw
2010-11-24	Merge branch 'en/and-cascade-tests'	blob \| diff \| raw
2010-11-24	Merge branch 'aw/git-p4-deletion' into maint	blob \| diff \| raw \| diff to current
2010-11-17	t6022: Use -eq not = to test output of wc -l	blob \| diff \| raw \| diff to current
2010-11-09	t6022 (renaming merge): chain test commands with &&	blob \| diff \| raw
2010-11-05	Merge branch 'aw/git-p4-deletion'	blob \| diff \| raw \| diff to current
2010-11-05	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2010-10-27	Merge branch 'en/tree-walk-optim'	blob \| diff \| raw \| diff to current
2010-09-30	merge_content(): Check whether D/F conflicts are still...	blob \| diff \| raw \| diff to current
2010-09-30	conflict_rename_rename_1to2(): Fix checks for presence...	blob \| diff \| raw \| diff to current
2010-09-30	conflict_rename_delete(): Check whether D/F conflicts...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Delay content merging for renames	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Move handling of double rename of...	blob \| diff \| raw \| diff to current
2010-09-30	t6022: Add tests for rename/rename combined with D...	blob \| diff \| raw \| diff to current
2010-09-30	t6022: Add paired rename+D/F conflict: (two/file, one...	blob \| diff \| raw \| diff to current
2010-09-30	t6022: Add tests with both rename source & dest involve...	blob \| diff \| raw \| diff to current
2010-09-30	t6022: Add tests for reversing order of merges when...	blob \| diff \| raw \| diff to current
2010-09-30	t6022: Add test combinations of {content conflict?...	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'rr/format-patch-count-without-merges'	blob \| diff \| raw \| diff to current
2010-09-18	Merge branch 'js/ls-files-x-doc'	blob \| diff \| raw \| diff to current
2010-09-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'bc/maint-fetch-url-only'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'en/d-f-conflict-fix'	blob \| diff \| raw \| diff to current
2010-09-06	Merge branch 'xx/trivial' into maint	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'nd/maint-fix-replace'	blob \| diff \| raw \| diff to current
2010-09-01	Merge branch 'sg/rerere-gc-old-still-used' into maint	blob \| diff \| raw \| diff to current
2010-09-01	Merge branch 'en/rebase-against-rebase-fix' into maint	blob \| diff \| raw \| diff to current
2010-08-31	Merge branch 'en/d-f-conflict-fix'	blob \| diff \| raw \| diff to current
2010-08-31	Merge branch 'en/fast-export-fix'	blob \| diff \| raw \| diff to current
2010-08-31	Merge branch 'sg/rerere-gc-old-still-used'	blob \| diff \| raw \| diff to current
2010-08-30	Merge branch 'maint-1.7.1' into maint	blob \| diff \| raw \| diff to current
2010-08-22	Merge branch 'nd/fix-sparse-checkout'	blob \| diff \| raw \| diff to current
2010-08-22	Merge branch 'en/rebase-against-rebase-fix'	blob \| diff \| raw \| diff to current
2010-08-19	Merge branch 'tr/xsize-bits' into maint	blob \| diff \| raw \| diff to current
2010-08-19	Merge branch 'jc/sha1-name-find-fix' into maint	blob \| diff \| raw \| diff to current
2010-08-18	Merge branch 'sp/fix-smart-http-deadlock-on-error'...	blob \| diff \| raw \| diff to current
2010-08-18	Merge branch 'cc/find-commit-subject'	blob \| diff \| raw \| diff to current
2010-08-18	Merge branch 'tr/xsize-bits'	blob \| diff \| raw \| diff to current
2010-08-13	Merge branch 'jc/sha1-name-find-fix'	blob \| diff \| raw \| diff to current
2010-08-13	Merge branch 'sp/fix-smart-http-deadlock-on-error'	blob \| diff \| raw \| diff to current
2010-08-03	Merge branch 'sv/maint-diff-q-clear-fix' into maint	blob \| diff \| raw \| diff to current
2010-08-02	Merge git://repo.or.cz/git-gui into pt/git-gui	blob \| diff \| raw \| diff to current
2010-07-27	Sync with 1.7.1.2	blob \| diff \| raw \| diff to current
2010-07-26	Merge branch 'maint-1.7.1' into maint	blob \| diff \| raw \| diff to current
2010-07-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-07-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-07-16	Merge branch 'jc/diff-merge-base-multi'	blob \| diff \| raw \| diff to current
2010-07-15	Merge branch 'wp/merge-tree-fix'	blob \| diff \| raw \| diff to current
2010-07-15	Merge branch 'js/merge-rr-fix'	blob \| diff \| raw \| diff to current
2010-07-15	Merge branch 'jc/diff-merge-base-multi'	blob \| diff \| raw \| diff to current
2010-07-15	Merge branch 'jn/grep-open'	blob \| diff \| raw \| diff to current
2010-07-15	Merge branch 'jk/maint-status-keep-index-timestamp'	blob \| diff \| raw \| diff to current
2010-07-15	Merge branch 'bc/maint-makefile-fixes'	blob \| diff \| raw \| diff to current
2010-07-15	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-07-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-07-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-07-09	Merge remote branch 'ko/master' into jc/read-tree-cache...	blob \| diff \| raw \| diff to current
2010-07-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-07-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-07-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-07-05	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'ar/decorate-color'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'mg/doc-rev-parse-treepath-syntax'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'cc/cherry-pick-stdin'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'jl/status-ignore-submodules'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'jk/url-decode'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'jn/grep-open'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'jp/string-list-api-cleanup'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'tr/rev-list-count'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'as/maint-completion-set-u-fix'	blob \| diff \| raw \| diff to current
2010-06-30	Merge branch 'jl/maint-diff-ignore-submodules'	blob \| diff \| raw \| diff to current
2010-06-29	Sync with 1.7.1.1	blob \| diff \| raw \| diff to current
2010-06-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-27	Merge branch 'cp/textconv-cat-file'	blob \| diff \| raw \| diff to current
2010-06-27	Merge branch 'pb/maint-perl-errmsg-no-dir'	blob \| diff \| raw \| diff to current
2010-06-27	Merge branch 'tr/send-email-8bit'	blob \| diff \| raw \| diff to current
2010-06-27	Merge branch 'js/maint-am-rebase-invalid-author'	blob \| diff \| raw \| diff to current
2010-06-27	Merge branch 'ab/blame-textconv'	blob \| diff \| raw \| diff to current
2010-06-27	Merge branch 'jn/show-num-walks'	blob \| diff \| raw \| diff to current
2010-06-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-23	Merge branch 'jk/url-decode'	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'jc/maint-simpler-common-prefix'	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'sb/format-patch-signature'	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'mg/pretty-magic-space'	blob \| diff \| raw \| diff to current
2010-06-22	Merge branch 'jn/gitweb-return-or-exit-cleanup'	blob \| diff \| raw \| diff to current
next