Code

merge overwrites unstaged changes in renamed file
[git.git] / git-cvsserver.perl
2012-04-10 David A. GreeneAdd 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable...
2012-04-02 Junio C HamanoMerge branch 'pt/gitk'
2012-03-26 Junio C HamanoMerge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-26 Junio C HamanoMerge branch 'ms/maint-config-error-at-eol-linecount...
2012-03-24 Junio C HamanoMerge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16 Junio C HamanoMerge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Junio C HamanoMerge branch 'th/doc-diff-submodule-option'
2012-03-13 Junio C HamanoMerge branch 'ms/maint-config-error-at-eol-linecount'
2012-03-12 Junio C HamanoMerge branch 'jc/maint-diff-patch-header' into maint
2012-03-12 Junio C HamanoMerge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-08 Junio C HamanoMerge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-06 Junio C HamanoMerge branch 'jc/maint-diff-patch-header'
2012-03-06 Junio C HamanoMerge branch 'maint-1.7.7' into maint-1.7.8
2012-03-05 Junio C HamanoMerge branch 'jn/maint-gitweb-invalid-regexp' into...
2012-03-05 Junio C HamanoMerge branch 'sp/smart-http-failure-to-push' into maint
2012-03-02 Junio C HamanoMerge branch 'rs/no-no-no-parseopt'
2012-03-01 Junio C HamanoMerge branch 'jn/maint-gitweb-invalid-regexp'
2012-02-27 Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27 Junio C HamanoMerge branch 'jn/ancient-meld-support' into maint
2012-02-27 Junio C HamanoMerge branch 'sp/smart-http-failure-to-push'
2012-02-23 Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix'
2012-02-21 Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20 Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-16 Junio C HamanoMerge branch 'jc/checkout-out-of-unborn' into maint
2012-02-16 Junio C HamanoMerge branch 'jc/maint-mailmap-output' into maint
2012-02-16 Junio C HamanoMerge branch 'jc/maint-commit-ignore-i-t-a' into maint
2012-02-16 Junio C HamanoMerge branch 'mm/empty-loose-error-message' into maint
2012-02-14 Junio C HamanoMerge branch 'jn/ancient-meld-support'
2012-02-14 Junio C HamanoMerge branch 'jk/maint-tag-show-fixes' into maint
2012-02-13 Junio C HamanoMerge branch 'js/add-e-submodule-fix' into maint
2012-02-13 Junio C HamanoMerge branch 'jc/parse-date-raw' into maint
2012-02-13 Junio C HamanoMerge branch 'jc/checkout-out-of-unborn'
2012-02-13 Junio C HamanoMerge branch 'jc/maint-mailmap-output'
2012-02-13 Junio C HamanoMerge branch 'jc/maint-commit-ignore-i-t-a'
2012-02-13 Junio C HamanoMerge branch 'jk/maint-tag-show-fixes'
2012-02-13 Junio C HamanoMerge branch 'mm/empty-loose-error-message'
2012-02-10 Junio C HamanoMerge branch 'js/add-e-submodule-fix'
2012-02-10 Junio C HamanoMerge branch 'jc/parse-date-raw'
2012-02-10 Junio C HamanoMerge branch 'da/maint-mergetool-twoway' into maint
2012-02-06 Junio C HamanoMerge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06 Junio C HamanoMerge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06 Junio C HamanoSync with 1.7.6.6
2012-02-01 Junio C HamanoMerge branch 'da/maint-mergetool-twoway'
2012-01-29 Junio C HamanoMerge branch 'rs/diff-postimage-in-context'
2012-01-29 Junio C HamanoMerge branch 'sp/smart-http-failure-to-push'
2012-01-29 Junio C HamanoMerge branch 'jc/maint-log-first-parent-pathspec'
2012-01-29 Junio C HamanoMerge branch 'tr/maint-mailinfo'
2012-01-27 Junio C HamanoMerge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-18 Junio C HamanoMerge branch 'maint-1.7.7' into maint
2012-01-18 Junio C HamanoMerge branch 'mh/maint-show-ref-doc'
2012-01-18 Junio C HamanoMerge branch 'tr/maint-word-diff-incomplete-line'
2012-01-13 Junio C HamanoMerge branch 'jc/request-pull-show-head-4'
2012-01-13 Junio C HamanoMerge branch 'tr/maint-mailinfo'
2012-01-13 Junio C HamanoMerge branch 'jk/maint-upload-archive'
2012-01-13 Junio C HamanoMerge branch 'maint-1.7.7' into maint
2012-01-12 Junio C HamanoMerge branch 'maint-1.7.7' into maint
2012-01-10 Junio C HamanoMerge the attributes fix in from maint-1.6.7 branch
2012-01-09 Junio C HamanoMerge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-06 Junio C HamanoMerge branch 'maint-1.7.7' into maint
2012-01-04 Junio C HamanoMerge branch 'nd/maint-parse-depth' into maint
2012-01-03 Junio C HamanoMerge branch 'maint-1.7.7' into maint
2011-12-28 Junio C HamanoMerge branch 'jv/maint-config-set' into maint
2011-12-28 Junio C HamanoMerge branch 'jc/checkout-m-twoway' into maint
2011-12-28 Junio C HamanoMerge branch 'tr/doc-sh-setup' into maint
2011-12-28 Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-28 Junio C HamanoMerge branch 'jk/maint-push-v-is-verbose' into maint
2011-12-28 Junio C HamanoMerge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
2011-12-28 Junio C HamanoMerge branch 'jk/maint-snprintf-va-copy' into maint
2011-12-28 Junio C HamanoMerge branch 'jk/maint-mv' into maint
2011-12-28 Junio C HamanoMerge branch 'ew/keepalive' into maint
2011-12-28 Junio C HamanoMerge branch 'aw/rebase-i-stop-on-failure-to-amend...
2011-12-28 Junio C HamanoMerge branch 'tj/maint-imap-send-remove-unused' into...
2011-12-28 Junio C HamanoMerge branch 'na/strtoimax' into maint
2011-12-22 Junio C HamanoMerge branch 'tr/doc-sh-setup'
2011-12-22 Junio C HamanoMerge branch 'tr/pty-all'
2011-12-22 Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init'
2011-12-22 Junio C HamanoMerge branch 'jc/maint-lf-to-crlf-keep-crlf'
2011-12-22 Junio C HamanoMerge branch 'jk/maint-push-v-is-verbose'
2011-12-22 Junio C HamanoMerge branch 'jk/maint-do-not-feed-stdin-to-tests'
2011-12-22 Junio C HamanoMerge branch 'jn/test-cleanup-7006'
2011-12-21 Junio C HamanoMerge branch 'jl/submodule-status-failure-report' into...
2011-12-21 Junio C HamanoMerge branch 'tr/userdiff-c-returns-pointer' into maint
2011-12-21 Junio C HamanoMerge branch 'bc/maint-apply-check-no-patch' into maint
2011-12-21 Junio C HamanoMerge branch 'cn/maint-lf-to-crlf-filter' into maint
2011-12-21 Junio C HamanoMerge branch 'jk/maint-upload-archive' into maint
2011-12-21 Junio C HamanoMerge branch 'ms/commit-cc-option-helpstring' into...
2011-12-20 Junio C HamanoMerge branch 'jc/request-pull-show-head-4'
2011-12-20 Junio C HamanoMerge branch 'jc/checkout-m-twoway'
2011-12-20 Junio C HamanoMerge branch 'ew/keepalive'
2011-12-20 Junio C HamanoMerge branch 'jc/checkout-m-twoway'
2011-12-20 Junio C HamanoMerge branch 'jk/maint-snprintf-va-copy'
2011-12-20 Junio C HamanoMerge branch 'jk/maint-mv'
2011-12-18 Junio C HamanoUpdate jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17 Junio C HamanoMerge branch 'aw/rebase-i-stop-on-failure-to-amend'
2011-12-17 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2011-12-14 Junio C HamanoMerge branch 'jl/submodule-status-failure-report'
2011-12-14 Junio C HamanoMerge branch 'tr/userdiff-c-returns-pointer'
2011-12-14 Junio C HamanoMerge branch 'bc/maint-apply-check-no-patch'
2011-12-14 Junio C HamanoMerge branch 'cn/maint-lf-to-crlf-filter'
next