reset [<commit>] paths...: do not mishandle unmerged paths
[git] / convert.c
2011-06-29  Junio C HamanoMerge branch 'maint-1.7.5' into maint
2011-06-26  Junio C HamanoMerge branch 'maint'
2011-06-22  Junio C HamanoMerge branch 'maint'
2011-06-21  Junio C HamanoMerge branch 'maint'
2011-06-20  Junio C HamanoMerge branch 'mk/grep-pcre'
2011-06-19  Junio C HamanoMerge branch 'maint'
2011-06-17  Junio C HamanoMerge branch 'ab/i18n-scripts-basic'
2011-06-09  Junio C HamanoMerge branch 'maint'
2011-06-07  Junio C HamanoMerge branch 'jc/magic-pathspec'
2011-06-06  Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-06-06  Junio C HamanoMerge branch 'jk/diff-not-so-quick'
2011-06-06  Junio C HamanoMerge branch 'bc/maint-status-z-to-use-porcelain'
2011-06-01  Junio C HamanoSync with 1.7.5.4 v1.7.6-rc0
2011-06-01  Junio C HamanoMerge branch 'jk/maint-config-alias-fix' into maint
2011-05-31  Junio C HamanoMerge branch 'jk/format-patch-am'
2011-05-31  Junio C HamanoMerge branch 'jn/doc-remote-helpers'
2011-05-31  Junio C HamanoMerge branch 'jc/log-quiet-fix'
2011-05-31  Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak'
2011-05-31  Junio C HamanoMerge branch 'jk/maint-docs'
2011-05-31  Junio C HamanoMerge branch 'jk/read-in-full-stops-on-error'
2011-05-31  Junio C HamanoMerge branch 'jk/maint-remote-mirror-safer'
2011-05-31  Junio C HamanoSync with maint
2011-05-31  Junio C HamanoMerge branch 'jc/fmt-req-fix'
2011-05-31  Junio C HamanoMerge branch 'jk/maint-config-alias-fix'
2011-05-30  Junio C HamanoMerge branch 'maint'
2011-05-30  Junio C HamanoMerge branch 'mk/grep-pcre'
2011-05-30  Junio C HamanoMerge branch 'jk/haves-from-alternate-odb'
2011-05-26  Junio C HamanoMerge branch 'jn/userdiff-perl-updates'
2011-05-26  Junio C HamanoMerge branch 'rg/no-gecos-in-pwent'
2011-05-26  Junio C HamanoMerge branch 'jk/fetch-mark-complete-optimization'
2011-05-26  Junio C HamanoMerge branch 'jn/gitweb-js'
2011-05-26  Junio C HamanoMerge branch 'jn/ctags-more'
2011-05-26  Junio C HamanoMerge branch 'jc/require-work-tree-exists'
2011-05-26  Junio C HamanoSync with 1.7.5.3
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26  Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe' into maint
2011-05-26  Junio C HamanoMerge branch 'rg/copy-gecos-username' into maint
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26  Junio C HamanoMerge branch 'svn-fe-maint' of git://repo.or.cz/git...
2011-05-25  Junio C HamanoMerge branch 'jc/bigfile'
2011-05-25  Junio C HamanoMerge branch 'maint'
2011-05-23  Junio C HamanoMerge branch 'tr/add-i-no-escape'
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 '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-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 'jc/fix-add-u-unmerged' 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-13  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-13  Junio C HamanoMerge branch 'jc/fix-add-u-unmerged'
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 'jc/maint-branch-mergeoptions'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-add-p-overlapping-hunks'
2011-05-09  Junio C Hamanoconvert: make it harder to screw up adding a conversion...
2011-05-09  Junio C Hamanoconvert: make it safer to add conversion attributes
2011-05-09  Junio C Hamanoconvert: give saner names to crlf/eol variables, types...
2011-05-09  Junio C Hamanoconvert: rename the "eol" global variable to "core_eol"
2011-05-06  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions' into mg...
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 'gr/cvsimport-alternative-cvspass-location'
2011-05-06  Junio C HamanoMerge branch 'nd/struct-pathspec'
2011-05-05  Junio C HamanoMerge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-04  Junio C HamanoMerge branch 'jk/format-patch-multiline-header'
2011-05-04  Junio C HamanoMerge branch 'sp/maint-clear-postfields' into maint
2011-05-04  Junio C HamanoMerge branch 'jk/maint-stash-oob' into maint
2011-05-04  Junio C HamanoMerge branch 'jc/pack-objects-bigfile' into maint
2011-05-02  Junio C HamanoMerge branch 'mz/maint-rename-unmerged'
2011-04-29  Junio C HamanoMerge branch 'mg/x-years-12-months' into maint
2011-04-28  Junio C HamanoMerge branch 'jc/diff-irreversible-delete'
2011-04-28  Junio C HamanoMerge branch 'mz/rebase'
2011-04-28  Junio C HamanoMerge branch 'en/merge-recursive'
next