git.oblomov.eu Git - git/history - t/t6022-merge-rename.sh

2011-08-24	Junio C Hamano	Merge branch 'jc/merge-reword' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'nk/branch-v-abbrev' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'hv/submodule-update-none' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'ci/forbid-unwanted-current-branch-update...	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'jc/lookup-object-hash' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'di/fast-import-tagging' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'di/fast-import-blob-tweak' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'va/p4-branch-import' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'va/p4-rename-copy' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'jc/traverse-commit-list' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'nd/maint-clone-gitdir' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'fg/submodule-ff-check-before-push' into...	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'jc/combine-diff-callback' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'jk/pager-with-external-command' into...	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'fk/make-auto-header-dependencies' into...	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'rr/revert-cherry-pick-continue' into...	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'bw/doc-repo-layout' into next	blob \| commitdiff \| raw
2011-08-24	Junio C Hamano	Merge branch 'master' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'ac/describe-dirty-refresh' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'jc/maint-clone-alternates' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'fk/use-kwset-pickaxe-grep-f' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'mg/branch-set-upstream-previous' into...	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'da/difftool-mergtool-refactor' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'jc/maint-autofix-tag-in-head' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'di/fast-import-doc' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'rc/diff-cleanup-records' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'di/fast-import-deltified-tree' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'di/fast-import-ident' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'fg/submodule-git-file-git-dir' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'nd/decorate-grafts' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'jk/color-and-pager' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'jn/plug-empty-tree-leak' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'en/merge-recursive-2' into next	blob \| commitdiff \| raw
2011-08-23	Junio C Hamano	Merge branch 'jc/maint-combined-diff-work-tree' into...	blob \| commitdiff \| raw \| diff to current
2011-08-18	Junio C Hamano	Merge branch 'jc/maint-combined-diff-work-tree'	blob \| commitdiff \| raw \| diff to current
2011-08-16	Junio C Hamano	Merge branch 'jk/fast-export-quote-path' into maint	blob \| commitdiff \| raw \| diff to current
2011-08-16	Junio C Hamano	Merge branch 'bw/log-all-ref-updates-doc' into maint	blob \| commitdiff \| raw \| diff to current
2011-08-16	Junio C Hamano	Merge branch 'js/maint-add-path-stat-pwd' into maint	blob \| commitdiff \| raw \| diff to current
2011-08-16	Junio C Hamano	Merge branch 'jn/mime-type-with-params' into maint	blob \| commitdiff \| raw \| diff to current
2011-08-16	Junio C Hamano	Merge branch 'jc/submodule-sync-no-auto-vivify' into...	blob \| commitdiff \| raw \| diff to current
2011-08-16	Junio C Hamano	Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Avoid unnecessary file rewrites	blob \| commitdiff \| raw
2011-08-14	Elijah Newren	t6022: Additional tests checking for unnecessary update...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Fix spurious 'refusing to lose untrack...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6022: Add testcase for spurious "refusing to lose...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Make modify/delete handling code reusable	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: When we detect we can skip an update...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Provide more info in conflict markers...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Improve handling of rename target...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6022: Add testcase for merging a renamed file with...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6022: New tests checking for unnecessary updates of...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6022: Remove unnecessary untracked files to make test...	blob \| commitdiff \| raw \| diff to current
2011-08-11	Junio C Hamano	Merge branch 'jk/fast-export-quote-path'	blob \| commitdiff \| raw \| diff to current
2011-08-05	Junio C Hamano	Merge branch 'jk/fast-export-quote-path' into next	blob \| commitdiff \| raw \| diff to current
2011-08-05	Junio C Hamano	Merge branch 'jc/maint-combined-diff-work-tree' into...	blob \| commitdiff \| raw \| diff to current
2011-08-01	Junio C Hamano	Merge branch 'jc/streaming-filter'	blob \| commitdiff \| raw \| diff to current
2011-08-01	Junio C Hamano	Merge branch 'jc/legacy-loose-object' into maint	blob \| commitdiff \| raw \| diff to current
2011-08-01	Junio C Hamano	Merge branch 'jc/maint-1.7.3-checkout-describe' into...	blob \| commitdiff \| raw \| diff to current
2011-07-22	Junio C Hamano	Merge branch 'jc/streaming-filter' into next	blob \| commitdiff \| raw \| diff to current
2011-07-22	Junio C Hamano	Merge branch 'jk/tag-contains-ab'	blob \| commitdiff \| raw \| diff to current
2011-07-22	Junio C Hamano	Merge branch 'bw/log-all-ref-updates-doc'	blob \| commitdiff \| raw \| diff to current
2011-07-22	Junio C Hamano	Merge branch 'js/maint-add-path-stat-pwd'	blob \| commitdiff \| raw \| diff to current
2011-07-19	Junio C Hamano	Merge branch 'jn/mime-type-with-params'	blob \| commitdiff \| raw \| diff to current
2011-07-19	Junio C Hamano	Merge branch 'jc/submodule-sync-no-auto-vivify'	blob \| commitdiff \| raw \| diff to current
2011-07-14	Junio C Hamano	Merge branch 'bw/log-all-ref-updates-doc' into next	blob \| commitdiff \| raw \| diff to current
2011-07-14	Junio C Hamano	Merge branch 'js/maint-add-path-stat-pwd' into next	blob \| commitdiff \| raw \| diff to current
2011-07-14	Junio C Hamano	Merge branch 'jk/tag-contains-ab' into next	blob \| commitdiff \| raw \| diff to current
2011-07-13	Junio C Hamano	Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'	blob \| commitdiff \| raw \| diff to current
2011-07-13	Junio C Hamano	Merge branch 'jc/legacy-loose-object'	blob \| commitdiff \| raw \| diff to current
2011-07-06	Junio C Hamano	Merge commit 'v1.7.6' into jc/checkout-reflog-fix	blob \| commitdiff \| raw \| diff to current
2011-07-05	Junio C Hamano	Merge branch 'jn/mime-type-with-params' into next	blob \| commitdiff \| raw \| diff to current
2011-07-05	Junio C Hamano	Merge branch 'jk/tag-contains-ab' (early part) into...	blob \| commitdiff \| raw \| diff to current
2011-07-05	Junio C Hamano	Merge branch 'jc/submodule-sync-no-auto-vivify' into...	blob \| commitdiff \| raw \| diff to current
2011-07-01	Junio C Hamano	Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...	blob \| commitdiff \| raw \| diff to current
2011-07-01	Junio C Hamano	Merge branch 'jc/legacy-loose-object' into next	blob \| commitdiff \| raw \| diff to current
2011-06-30	Junio C Hamano	Merge branch 'jc/streaming-filter' into next	blob \| commitdiff \| raw \| diff to current
2011-06-30	Junio C Hamano	Merge branch 'jc/streaming' into next	blob \| commitdiff \| raw \| diff to current
2011-06-30	Junio C Hamano	Merge branch 'ab/i18n-scripts' into next	blob \| commitdiff \| raw \| diff to current
2011-06-30	Junio C Hamano	Merge branch 'js/i18n-windows'	blob \| commitdiff \| raw \| diff to current
2011-06-30	Junio C Hamano	Merge branch 'jc/maint-1.7.3-checkout-describe'	blob \| commitdiff \| raw \| diff to current
2011-06-30	Junio C Hamano	Merge branch 'jk/maint-1.7.2-status-ignored'	blob \| commitdiff \| raw \| diff to current
2011-06-30	Junio C Hamano	Merge branch 'mg/diff-stat-count'	blob \| commitdiff \| raw \| diff to current
2011-06-17	Junio C Hamano	Merge branch 'ab/i18n-scripts-basic'	blob \| commitdiff \| raw \| diff to current
2011-06-06	Junio C Hamano	Merge branch 'jn/mime-type-with-params'	blob \| commitdiff \| raw \| diff to current
2011-06-06	Junio C Hamano	Merge branch 'jk/diff-not-so-quick'	blob \| commitdiff \| raw \| diff to current
2011-06-06	Junio C Hamano	Merge branch 'bc/maint-status-z-to-use-porcelain'	blob \| commitdiff \| raw \| diff to current
2011-06-01	Junio C Hamano	Merge branch 'jk/maint-config-alias-fix' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-31	Junio C Hamano	Merge remote-tracking branch 'ko/maint' into jc/diff...	blob \| commitdiff \| raw \| diff to current
2011-05-31	Junio C Hamano	Merge branch 'jk/maint-config-alias-fix'	blob \| commitdiff \| raw \| diff to current
2011-05-30	Junio C Hamano	Merge branch 'jc/notes-batch-removal'	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'rg/no-gecos-in-pwent'	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'jn/ctags-more'	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix' into...	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'rg/copy-gecos-username' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix' into...	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| commitdiff \| raw \| diff to current
2011-05-25	Junio C Hamano	Merge branch 'js/log-abbrev-commit-config'	blob \| commitdiff \| raw \| diff to current
2011-05-23	Junio C Hamano	Merge branch 'ms/ls-remote-exit-with-status'	blob \| commitdiff \| raw \| diff to current
2011-05-23	Junio C Hamano	Merge branch 'mg/config-symbolic-constants'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom