Andrew's git / gitweb.git / history
?
advice: Introduce error_resolve_conflict
[gitweb.git] / convert.c
2011-06-20 Merge branch 'mk/grep-pcre' blob | diff | raw
2011-06-19 Merge branch 'maint' blob | diff | raw
2011-06-17 Merge branch 'ab/i18n-scripts-basic' blob | diff | raw
2011-06-09 Merge branch 'maint' blob | diff | raw
2011-06-07 Merge branch 'jc/magic-pathspec' blob | diff | raw
2011-06-06 Merge branch 'jn/mime-type-with-params' blob | diff | raw
2011-06-06 Merge branch 'jk/diff-not-so-quick' blob | diff | raw
2011-06-06 Merge branch 'bc/maint-status-z-to-use-porcelain' blob | diff | raw
2011-06-01 Sync with 1.7.5.4 v1.7.6-rc0 blob | diff | raw
2011-06-01 Merge branch 'jk/maint-config-alias-fix' into maint blob | diff | raw | diff to current
2011-05-31 Merge branch 'jk/format-patch-am' blob | diff | raw
2011-05-31 Merge branch 'jn/doc-remote-helpers' blob | diff | raw
2011-05-31 Merge branch 'jc/log-quiet-fix' blob | diff | raw
2011-05-31 Merge branch 'kk/maint-prefix-in-config-mak' blob | diff | raw
2011-05-31 Merge branch 'jk/maint-docs' blob | diff | raw
2011-05-31 Merge branch 'jk/read-in-full-stops-on-error' blob | diff | raw
2011-05-31 Merge branch 'jk/maint-remote-mirror-safer' blob | diff | raw
2011-05-31 Sync with maint blob | diff | raw
2011-05-31 Merge branch 'jc/fmt-req-fix' blob | diff | raw
2011-05-31 Merge branch 'jk/maint-config-alias-fix' blob | diff | raw
2011-05-30 Merge branch 'maint' blob | diff | raw
2011-05-30 Merge branch 'mk/grep-pcre' blob | diff | raw
2011-05-30 Merge branch 'jk/haves-from-alternate-odb' blob | diff | raw
2011-05-26 Merge branch 'jn/userdiff-perl-updates' blob | diff | raw
2011-05-26 Merge branch 'rg/no-gecos-in-pwent' blob | diff | raw
2011-05-26 Merge branch 'jk/fetch-mark-complete-optimization' blob | diff | raw
2011-05-26 Merge branch 'jn/gitweb-js' blob | diff | raw
2011-05-26 Merge branch 'jn/ctags-more' blob | diff | raw
2011-05-26 Merge branch 'jc/require-work-tree-exists' blob | diff | raw
2011-05-26 Sync with 1.7.5.3 blob | diff | raw
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into... blob | diff | raw | diff to current
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock... blob | diff | raw | diff to current
2011-05-26 Merge branch 'jm/maint-diff-words-with-sbe' into maint blob | diff | raw | diff to current
2011-05-26 Merge branch 'rg/copy-gecos-username' into maint blob | diff | raw | diff to current
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into... blob | diff | raw | diff to current
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock... blob | diff | raw | diff to current
2011-05-26 Merge branch 'svn-fe-maint' of git://repo.or.cz/git... blob | diff | raw | diff to current
2011-05-25 Merge branch 'jc/bigfile' blob | diff | raw
2011-05-25 Merge branch 'maint' blob | diff | raw
2011-05-23 Merge branch 'tr/add-i-no-escape' blob | diff | raw
2011-05-23 Merge branch 'jm/maint-diff-words-with-sbe' blob | diff | raw
2011-05-23 Merge branch 'js/mingw-shutdown' blob | diff | raw
2011-05-23 Merge branch 'ab/i18n-scripts-basic' blob | diff | raw
2011-05-23 Merge branch 'jc/magic-pathspec' blob | diff | raw
2011-05-23 Merge branch 'jk/blame-line-porcelain' blob | diff | raw
2011-05-21 Merge branch 'maint' blob | diff | raw
2011-05-20 Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' blob | diff | raw
2011-05-20 Merge branch 'rg/copy-gecos-username' blob | diff | raw
2011-05-20 Merge branch 'jl/submodule-conflicted-gitmodules' blob | diff | raw
2011-05-20 Merge branch 'jc/replacing' blob | diff | raw
2011-05-20 Merge branch 'nd/sparse-co-fix' blob | diff | raw
2011-05-20 Merge branch 'ld/p4-preserve-user-names' blob | diff | raw
2011-05-20 Merge branch 'ms/tagname-does-not-begin-with-dash' blob | diff | raw
2011-05-20 Merge branch 'jk/git-connection-deadlock-fix' blob | diff | raw
2011-05-20 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock... blob | diff | raw
2011-05-20 Merge branch 'jk/cherry-pick-root-with-resolve' blob | diff | raw
2011-05-20 Merge branch 'jc/maint-pathspec-stdin-and-cmdline' blob | diff | raw
2011-05-20 Merge 1.7.5.2 in blob | diff | raw
2011-05-17 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc... blob | diff | raw | diff to current
2011-05-16 Merge branch 'jc/convert' blob | diff | raw
2011-05-16 Merge branch 'jc/fix-add-u-unmerged' into maint blob | diff | raw | diff to current
2011-05-16 Merge branch 'jc/maint-branch-mergeoptions' into maint blob | diff | raw | diff to current
2011-05-16 Merge branch 'jc/maint-add-p-overlapping-hunks' into... blob | diff | raw | diff to current
2011-05-13 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock... blob | diff | raw | diff to current
2011-05-13 Merge branch 'jc/fix-add-u-unmerged' blob | diff | raw | diff to current
2011-05-13 Merge branch 'gr/cvsimport-alternative-cvspass-location... blob | diff | raw | diff to current
2011-05-13 Merge branch 'jk/merge-one-file-working-tree' into... blob | diff | raw | diff to current
2011-05-13 Merge branch 'jc/fix-diff-files-unmerged' into maint blob | diff | raw | diff to current
2011-05-13 Merge branch 'mz/maint-rename-unmerged' into maint blob | diff | raw | diff to current
2011-05-13 Merge branch 'nd/struct-pathspec' blob | diff | raw | diff to current
2011-05-11 Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' blob | diff | raw | diff to current
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' blob | diff | raw | diff to current
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' blob | diff | raw | diff to current
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' blob | diff | raw | diff to current
2011-05-11 Merge branch 'jc/maint-branch-mergeoptions' blob | diff | raw | diff to current
2011-05-11 Merge branch 'jc/maint-add-p-overlapping-hunks' blob | diff | raw | diff to current
2011-05-09 convert: make it harder to screw up adding a conversion... blob | diff | raw
2011-05-09 convert: make it safer to add conversion attributes blob | diff | raw | diff to current
2011-05-09 convert: give saner names to crlf/eol variables, types... blob | diff | raw | diff to current
2011-05-09 convert: rename the "eol" global variable to "core_eol" blob | diff | raw | diff to current
2011-05-06 Merge branch 'jc/maint-branch-mergeoptions' into mg... blob | diff | raw | diff to current
2011-05-06 Merge branch 'im/hashcmp-optim' blob | diff | raw | diff to current
2011-05-06 Merge branch 'jk/merge-one-file-working-tree' blob | diff | raw | diff to current
2011-05-06 Merge branch 'jc/fix-diff-files-unmerged' blob | diff | raw | diff to current
2011-05-06 Merge branch 'gr/cvsimport-alternative-cvspass-location' blob | diff | raw | diff to current
2011-05-06 Merge branch 'nd/struct-pathspec' blob | diff | raw | diff to current
2011-05-05 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc... blob | diff | raw | diff to current
2011-05-04 Merge branch 'jk/format-patch-multiline-header' blob | diff | raw | diff to current
2011-05-04 Merge branch 'sp/maint-clear-postfields' into maint blob | diff | raw | diff to current
2011-05-04 Merge branch 'jk/maint-stash-oob' into maint blob | diff | raw | diff to current
2011-05-04 Merge branch 'jc/pack-objects-bigfile' into maint blob | diff | raw | diff to current
2011-05-02 Merge branch 'mz/maint-rename-unmerged' blob | diff | raw | diff to current
2011-04-29 Merge branch 'mg/x-years-12-months' into maint blob | diff | raw | diff to current
2011-04-28 Merge branch 'jc/diff-irreversible-delete' blob | diff | raw | diff to current
2011-04-28 Merge branch 'mz/rebase' blob | diff | raw | diff to current
2011-04-28 Merge branch 'en/merge-recursive' blob | diff | raw | diff to current
2011-04-28 Merge branch 'sp/maint-clear-postfields' blob | diff | raw | diff to current
2011-04-27 Merge branch 'mg/x-years-12-months' blob | diff | raw | diff to current
2011-04-27 Merge branch 'ef/maint-strbuf-init' blob | diff | raw | diff to current
2011-04-27 Merge branch 'jk/maint-stash-oob' blob | diff | raw | diff to current
next