Merge branch 'jm/maint-diff-words-with-sbe'
[git] / merge-recursive.c
2011-05-23  Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe'
2011-05-23  Junio C HamanoMerge branch 'js/mingw-shutdown'
2011-05-23  Junio C HamanoMerge branch 'ms/ls-remote-exit-with-status'
2011-05-23  Junio C HamanoMerge branch 'mg/config-symbolic-constants'
2011-05-23  Junio C HamanoMerge branch 'ab/i18n-scripts-basic'
2011-05-23  Junio C HamanoMerge branch 'jc/magic-pathspec'
2011-05-23  Junio C HamanoMerge branch 'jk/blame-line-porcelain'
2011-05-21  Junio C HamanoMerge branch 'maint'
2011-05-20  Junio C HamanoMerge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-20  Junio C HamanoMerge branch 'rg/copy-gecos-username'
2011-05-20  Junio C HamanoMerge branch 'jl/submodule-conflicted-gitmodules'
2011-05-20  Junio C HamanoMerge branch 'jc/replacing'
2011-05-20  Junio C HamanoMerge branch 'nd/sparse-co-fix'
2011-05-20  Junio C HamanoMerge branch 'ld/p4-preserve-user-names'
2011-05-20  Junio C HamanoMerge branch 'ms/tagname-does-not-begin-with-dash'
2011-05-20  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix'
2011-05-20  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-20  Junio C HamanoMerge branch 'jk/cherry-pick-root-with-resolve'
2011-05-20  Junio C HamanoMerge branch 'jc/maint-pathspec-stdin-and-cmdline'
2011-05-20  Junio C HamanoMerge 1.7.5.2 in
2011-05-20  Junio C HamanoRevert "Merge branch 'en/merge-recursive'"
2011-05-17  Junio C HamanoMerge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-16  Junio C HamanoMerge branch 'jc/convert'
2011-05-16  Junio C HamanoMerge branch 'ci/commit--interactive-atomic'
2011-05-16  Junio C HamanoMerge branch 'sg/completion-updates'
2011-05-16  Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak'
2011-05-16  Junio C HamanoMerge branch 'mg/merge-ff-config'
2011-05-16  Junio C HamanoMerge branch 'maint'
2011-05-16  Junio C HamanoMerge branch 'jn/maint-format-patch-doc' into maint
2011-05-16  Junio C HamanoMerge branch 'ss/cherry-pick-x-doc' into maint
2011-05-16  Junio C HamanoMerge branch 'vr/merge-base-doc' into maint
2011-05-16  Junio C HamanoMerge branch 'sr/maint-fast-import-tighten-option-parsi...
2011-05-16  Junio C HamanoMerge branch 'jc/t1506-shell-param-expansion-gotcha...
2011-05-16  Junio C HamanoMerge branch 'jc/fix-add-u-unmerged' into maint
2011-05-16  Junio C HamanoMerge branch 'jn/gitweb-dependency' into maint
2011-05-16  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions' into maint
2011-05-16  Junio C HamanoMerge branch 'jc/maint-add-p-overlapping-hunks' into...
2011-05-15  Junio C HamanoMerge branch 'maint'
2011-05-15  Junio C HamanoMerge branch 'cn/format-patch-quiet' into maint
2011-05-15  Junio C HamanoMerge branch 'jm/mergetool-submodules' into maint
2011-05-15  Junio C HamanoMerge branch 'jk/format-patch-quote-special-in-from...
2011-05-15  Junio C HamanoMerge branch 'vh/git-svn-doc' into maint
2011-05-15  Junio C HamanoMerge branch 'maint'
2011-05-15  Jonathan Niederadd, merge, diff: do not use strcasecmp to compare...
2011-05-13  Junio C HamanoMerge branch 'bf/commit-template-no-cleanup'
2011-05-13  Junio C HamanoMerge branch 'jc/t1506-shell-param-expansion-gotcha'
2011-05-13  Junio C HamanoMerge branch 'rr/rerere-libify-clear-gc'
2011-05-13  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-13  Junio C HamanoMerge branch 'jh/dirstat-lines'
2011-05-13  Junio C HamanoMerge branch 'jc/fix-add-u-unmerged'
2011-05-13  Junio C HamanoMerge branch 'jn/setup-revisions-glob-and-friends-passthru'
2011-05-13  Junio C HamanoMerge branch 'cn/log-parse-opt'
2011-05-13  Junio C HamanoMerge branch 'maint'
2011-05-13  Junio C HamanoMerge branch 'aw/maint-rebase-i-p-no-ff' into maint
2011-05-13  Junio C HamanoMerge branch 'gr/cvsimport-alternative-cvspass-location...
2011-05-13  Junio C HamanoMerge branch 'jk/merge-one-file-working-tree' into...
2011-05-13  Junio C HamanoMerge branch 'jc/fix-diff-files-unmerged' into maint
2011-05-13  Junio C HamanoMerge branch 'mz/maint-rename-unmerged' into maint
2011-05-13  Junio C HamanoMerge branch 'nd/struct-pathspec'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11  Junio C HamanoMerge branch 'jn/gitweb-dependency'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions'
2011-05-11  Junio C HamanoMerge branch 'jn/maint-test-merge-verify-parents'
2011-05-11  Junio C HamanoMerge branch 'vh/config-interactive-singlekey-doc'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-add-p-overlapping-hunks'
2011-05-11  Junio C HamanoMerge branch 'sr/maint-fast-import-tighten-option-parsing'
2011-05-11  Junio C HamanoMerge branch 'dm/http-cleanup'
2011-05-11  Junio C HamanoMerge branch 'jn/ctags'
2011-05-06  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions' into mg...
2011-05-06  Junio C HamanoMerge branch 'jn/run-command-error-failure'
2011-05-06  Junio C HamanoMerge branch 'js/info-man-path'
2011-05-06  Junio C HamanoMerge branch 'im/hashcmp-optim'
2011-05-06  Junio C HamanoMerge branch 'jk/merge-one-file-working-tree'
2011-05-06  Junio C HamanoMerge branch 'jc/fix-diff-files-unmerged'
2011-05-06  Junio C HamanoMerge branch 'cj/p4merge'
2011-05-06  Junio C HamanoMerge branch 'gr/cvsimport-alternative-cvspass-location'
2011-05-06  Junio C HamanoMerge branch 'sg/completion-cleanup'
2011-05-06  Junio C HamanoMerge branch 'js/blame-parsename'
2011-05-06  Junio C HamanoMerge branch 'jk/format-patch-quote-special-in-from'
2011-05-06  Junio C HamanoMerge branch 'nd/struct-pathspec'
2011-05-06  Junio C HamanoMerge branch 'aw/maint-rebase-i-p-no-ff'
2011-05-06  Junio C HamanoMerge branch 'mg/alias-expose-prefix'
2011-05-06  Junio C HamanoMerge branch 'mg/diff-uiconfig-doc'
2011-05-06  Junio C HamanoMerge branch 'maint'
2011-05-05  Junio C HamanoMerge branch 'maint'
2011-05-05  Junio C HamanoMerge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-04  Junio C HamanoMerge branch 'ml/test-readme'
2011-05-04  Junio C HamanoMerge branch 'ft/gitweb-tar-with-gzip-n'
2011-05-04  Junio C HamanoMerge branch 'mg/rev-list-count-cherry'
2011-05-04  Junio C HamanoMerge branch 'ss/doc-svn'
2011-05-04  Junio C HamanoMerge branch 'jn/format-patch-doc'
2011-05-04  Junio C HamanoMerge branch 'vr/merge-base-doc'
2011-05-04  Junio C HamanoMerge branch 'ss/cherry-pick-x-doc'
2011-05-04  Junio C HamanoMerge branch 'jn/maint-format-patch-doc'
2011-05-04  Junio C HamanoMerge branch 'jk/format-patch-multiline-header'
2011-05-04  Junio C HamanoMerge branch 'jm/mergetool-submodules'
2011-05-04  Junio C HamanoSync with 1.7.5.1
next