Merge branch 'js/maint-merge-one-file-osx-expr' into maint
[git] / mergetools / defaults
2011-10-21  Junio C HamanoMerge branch 'js/maint-merge-one-file-osx-expr' into...
2011-10-21  Junio C HamanoMerge branch 'jm/maint-apply-detects-corrupt-patch...
2011-10-21  Junio C HamanoMerge branch 'jc/checkout-from-tree-keep-local-changes...
2011-10-21  Junio C HamanoMerge branch 'mm/maint-config-explicit-bool-display...
2011-10-16  Junio C HamanoMerge branch 'ms/patch-id-with-overlong-line' into...
2011-10-16  Junio C HamanoMerge branch 'jc/maint-bundle-too-quiet' into maint
2011-10-16  Junio C HamanoMerge branch 'jk/filter-branch-require-clean-work-tree...
2011-10-16  Junio C HamanoMerge branch 'jc/maint-fsck-fwrite-size-check' into...
2011-10-16  Junio C HamanoMerge branch 'bk/ancestry-path' into maint
2011-10-16  Junio C HamanoMerge branch 'jk/maint-fetch-submodule-check-fix' into...
2011-10-16  Junio C HamanoMerge branch 'nm/grep-object-sha1-lock' into maint
2011-10-16  Junio C HamanoMerge branch 'jc/diff-index-unpack' into maint
2011-10-16  Junio C HamanoMerge branch 'mm/rebase-i-exec-edit' into maint
2011-09-26  Junio C HamanoMerge branch 'jc/namespace-doc-with-old-asciidoc'
2011-09-23  Junio C HamanoMerge 1.7.6.4 in
2011-09-20  Junio C HamanoMerge branch 'maint'
2011-09-19  Junio C HamanoMerge branch 'ph/format-patch-no-color'
2011-09-17  Junio C HamanoMerge branch 'ci/forbid-unwanted-current-branch-update'
2011-09-15  Junio C HamanoMerge branch 'ph/format-patch-no-color'
2011-09-12  Junio C HamanoSync with 1.7.6.3
2011-09-12  Junio C HamanoMerge branch 'maint'
2011-09-06  Junio C HamanoMerge branch 'rc/histogram-diff'
2011-09-06  Junio C HamanoMerge branch 'cb/maint-ls-files-error-report'
2011-09-06  Junio C HamanoMerge branch 'mh/check-ref-format-print-normalize'
2011-09-06  Junio C HamanoSync with 1.7.6.2
2011-09-02  Junio C HamanoMerge branch 'js/i18n-scripts-2'
2011-09-02  Junio C HamanoMerge branch 'tr/maint-t3903-misquoted-command'
2011-09-02  Junio C HamanoMerge branch 'bc/bisect-test-use-shell-path'
2011-09-02  Junio C HamanoMerge branch 'va/p4-branch-import-test-update'
2011-09-02  Junio C HamanoMerge branch 'tr/maint-strbuf-grow-nul-termination'
2011-09-02  Junio C HamanoMerge branch 'tr/maint-ident-to-git-memmove'
2011-09-02  Junio C HamanoMerge branch 'tr/maint-format-patch-empty-output'
2011-09-02  Junio C HamanoMerge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02  Junio C HamanoMerge branch 'gb/maint-am-patch-format-error-message'
2011-09-02  Junio C HamanoMerge branch 'ms/daemon-timeout-is-in-seconds'
2011-09-02  Junio C HamanoMerge branch 'bg/t5540-osx-grep'
2011-09-02  Junio C HamanoMerge branch 'jc/clean-exclude-doc'
2011-09-02  Junio C HamanoMerge branch 'mg/maint-notes-C-doc'
2011-09-02  Junio C HamanoMerge branch 'fg/submodule-ff-check-before-push'
2011-09-02  Junio C HamanoMerge branch 'rc/diff-cleanup-records'
2011-09-02  Junio C HamanoMerge branch 'fk/use-kwset-pickaxe-grep-f'
2011-09-02  Junio C HamanoMerge branch 'en/merge-recursive-2'
2011-08-30  Junio C HamanoMerge branch 'maint'
2011-08-29  Junio C HamanoMerge branch 'nd/decorate-grafts'
2011-08-29  Junio C HamanoMerge branch 'nd/maint-clone-gitdir'
2011-08-29  Junio C HamanoMerge branch 'ci/forbid-unwanted-current-branch-update'
2011-08-29  Junio C HamanoMerge branch 'jk/pager-with-external-command'
2011-08-29  Junio C HamanoMerge branch 'jc/maint-clone-alternates'
2011-08-29  Junio C HamanoMerge branch 'jk/color-and-pager'
2011-08-29  Junio C HamanoMerge branch 'mh/attr'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-tagging'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-blob-tweak'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-deltified-tree'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-ident'
2011-08-29  Junio C HamanoMerge branch 'bw/doc-repo-layout'
2011-08-29  Junio C HamanoMerge branch 'va/p4-branch-import'
2011-08-29  Junio C HamanoMerge branch 'jc/combine-diff-callback'
2011-08-29  Junio C HamanoMerge branch 'nk/branch-v-abbrev'
2011-08-25  Junio C HamanoMerge branch 'jc/merge-reword'
2011-08-25  Junio C HamanoMerge branch 'mg/branch-set-upstream-previous'
2011-08-25  Junio C HamanoMerge branch 'da/difftool-mergtool-refactor'
2011-08-19  David Aguilarmergetool--lib: Refactor tools into separate files