Sync with 1.7.6.2
[gitweb.git] / t / t6022-merge-rename.sh
2011-09-06 Sync with 1.7.6.2
2011-09-02 Merge branch 'js/i18n-scripts-2'
2011-09-02 Merge branch 'tr/maint-t3903-misquoted-command'
2011-09-02 Merge branch 'bc/bisect-test-use-shell-path'
2011-09-02 Merge branch 'va/p4-branch-import-test-update'
2011-09-02 Merge branch 'tr/maint-strbuf-grow-nul-termination'
2011-09-02 Merge branch 'tr/maint-ident-to-git-memmove'
2011-09-02 Merge branch 'tr/maint-format-patch-empty-output'
2011-09-02 Merge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02 Merge branch 'gb/maint-am-patch-format-error-message'
2011-09-02 Merge branch 'ms/daemon-timeout-is-in-seconds'
2011-09-02 Merge branch 'bg/t5540-osx-grep'
2011-09-02 Merge branch 'jc/clean-exclude-doc'
2011-09-02 Merge branch 'mg/maint-notes-C-doc'
2011-09-02 Merge branch 'fg/submodule-ff-check-before-push'
2011-09-02 Merge branch 'rc/diff-cleanup-records'
2011-09-02 Merge branch 'fk/use-kwset-pickaxe-grep-f'
2011-09-02 Merge branch 'en/merge-recursive-2'
2011-08-25 Merge branch 'jn/plug-empty-tree-leak'
2011-08-23 Merge branch 'jc/maint-combined-diff-work-tree' into...
2011-08-18 Merge branch 'jc/maint-combined-diff-work-tree'
2011-08-16 Merge branch 'jk/fast-export-quote-path' into maint
2011-08-16 Merge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16 Merge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16 Merge branch 'jn/mime-type-with-params' into maint
2011-08-16 Merge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16 Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-14 merge-recursive: Avoid unnecessary file rewrites
2011-08-14 t6022: Additional tests checking for unnecessary update...
2011-08-14 merge-recursive: Fix spurious 'refusing to lose untrack...
2011-08-14 t6022: Add testcase for spurious "refusing to lose...
2011-08-14 merge-recursive: Make modify/delete handling code reusable
2011-08-14 merge-recursive: When we detect we can skip an update...
2011-08-14 merge-recursive: Provide more info in conflict markers...
2011-08-14 merge-recursive: Improve handling of rename target...
2011-08-14 t6022: Add testcase for merging a renamed file with...
2011-08-14 t6022: New tests checking for unnecessary updates of...
2011-08-14 t6022: Remove unnecessary untracked files to make test...
2011-08-11 Merge branch 'jk/fast-export-quote-path'
2011-08-01 Merge branch 'jc/streaming-filter'
2011-08-01 Merge branch 'jc/legacy-loose-object' into maint
2011-08-01 Merge branch 'jc/maint-1.7.3-checkout-describe' into...
2011-07-22 Merge branch 'jk/tag-contains-ab'
2011-07-22 Merge branch 'bw/log-all-ref-updates-doc'
2011-07-22 Merge branch 'js/maint-add-path-stat-pwd'
2011-07-19 Merge branch 'jn/mime-type-with-params'
2011-07-19 Merge branch 'jc/submodule-sync-no-auto-vivify'
2011-07-13 Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
2011-07-13 Merge branch 'jc/legacy-loose-object'
2011-07-06 Merge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-06-30 Merge branch 'jc/streaming-filter' into next
2011-06-30 Merge branch 'jc/streaming' into next
2011-06-30 Merge branch 'ab/i18n-scripts' into next
2011-06-30 Merge branch 'js/i18n-windows'
2011-06-30 Merge branch 'jc/maint-1.7.3-checkout-describe'
2011-06-30 Merge branch 'jk/maint-1.7.2-status-ignored'
2011-06-30 Merge branch 'mg/diff-stat-count'
2011-06-17 Merge branch 'ab/i18n-scripts-basic'
2011-06-06 Merge branch 'jn/mime-type-with-params'
2011-06-06 Merge branch 'jk/diff-not-so-quick'
2011-06-06 Merge branch 'bc/maint-status-z-to-use-porcelain'
2011-06-01 Merge branch 'jk/maint-config-alias-fix' into maint
2011-05-31 Merge remote-tracking branch 'ko/maint' into jc/diff...
2011-05-31 Merge branch 'jk/maint-config-alias-fix'
2011-05-30 Merge branch 'jc/notes-batch-removal'
2011-05-26 Merge branch 'rg/no-gecos-in-pwent'
2011-05-26 Merge branch 'jn/ctags-more'
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Merge branch 'rg/copy-gecos-username' into maint
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-25 Merge branch 'js/log-abbrev-commit-config'
2011-05-23 Merge branch 'ms/ls-remote-exit-with-status'
2011-05-23 Merge branch 'mg/config-symbolic-constants'
2011-05-23 Merge branch 'ab/i18n-scripts-basic'
2011-05-23 Merge branch 'jk/blame-line-porcelain'
2011-05-20 Merge branch 'rg/copy-gecos-username'
2011-05-20 Merge branch 'jc/replacing'
2011-05-20 Merge branch 'nd/sparse-co-fix'
2011-05-20 Merge branch 'jk/git-connection-deadlock-fix'
2011-05-20 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-20 Revert "Merge branch 'en/merge-recursive'"
2011-05-16 Merge branch 'ci/commit--interactive-atomic'
2011-05-16 Merge branch 'sg/completion-updates'
2011-05-16 Merge branch 'kk/maint-prefix-in-config-mak'
2011-05-16 Merge branch 'mg/merge-ff-config'
2011-05-16 Merge branch 'maint'
2011-05-16 Merge branch 'jc/fix-add-u-unmerged' into maint
2011-05-16 Merge branch 'jc/maint-branch-mergeoptions' into maint
2011-05-15 Merge branches 'jc/convert', 'jc/bigfile' and 'jc/repla...
2011-05-15 Merge branch 'maint'
2011-05-15 Merge branch 'maint'
2011-05-13 Merge branch 'bf/commit-template-no-cleanup'
2011-05-13 Merge branch 'jc/t1506-shell-param-expansion-gotcha'
2011-05-13 Merge branch 'rr/rerere-libify-clear-gc'
2011-05-13 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-13 Merge branch 'jc/fix-add-u-unmerged'
2011-05-13 Merge branch 'jn/setup-revisions-glob-and-friends-passthru'
2011-05-13 Merge branch 'cn/log-parse-opt'
next