git p4 test: wait longer for p4d to start and test its pid
[gitweb.git] / xdiff-interface.c
2012-06-17 Sync with 1.7.10.5
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-15 Merge branch 'as/diff-shortstat-ignore-binary'
2012-06-13 Merge branch 'rj/gitweb-test-sans-date-parser'
2012-06-13 Merge branch 'fc/git-complete-helper-fix'
2012-06-12 Merge branch 'mm/api-credentials-doc'
2012-06-12 Merge branch 'jc/fmt-merge-msg-people'
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-06-08 Merge branch 'mm/api-credentials-doc'
2012-06-07 Merge branch 'mm/api-credentials-doc'
2012-06-07 Merge branch 'rr/maint-t3510-cascade-fix'
2012-06-07 Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'
2012-06-03 Sync with 1.7.10.4
2012-06-03 Merge branch 'ef/maint-rebase-error-message' into maint
2012-06-01 Merge branch 'ef/maint-rebase-error-message'
2012-06-01 Merge branch 'nh/empty-rebase'
2012-06-01 Sync with maint
2012-05-29 Merge branch 'va/git-p4-test'
2012-05-29 Merge branch 'jk/ident-gecos-strbuf'
2012-05-29 Merge branch 'mh/fetch-pack-constness'
2012-05-29 Merge branch 'mh/ref-api-lazy-loose'
2012-05-29 Merge branch 'maint'
2012-05-25 Merge branch 'sp/sh-windows-pwd'
2012-05-25 Merge branch 'mh/test-keep-prove-cache'
2012-05-25 Merge branch 'rs/dir-strbuf-read-recursive-fix'
2012-05-25 Merge branch 'fc/git-complete-helper-fix'
2012-05-25 Merge branch 'ap/checkout-no-progress-for-non-tty'
2012-05-25 Merge branch 'jk/format-person-part-buffer-limit'
2012-05-25 Merge branch 'jk/pretty-commit-header-incomplete-line'
2012-05-25 Merge branch 'jk/ident-split-fix'
2012-05-25 Merge branch 'rs/xdiff-fast-hash-fix'
2012-05-25 Merge branch 'mh/ref-api'
2012-05-25 Merge branch 'rs/maint-grep-F'
2012-05-25 Sync with 1.7.10.3
2012-05-25 Sync with maint
2012-05-23 Merge branch 'rs/archive-tree-in-tip-simplify'
2012-05-23 Merge branch 'js/rev-parse-doc-fix'
2012-05-23 Merge branch 'js/rebase-i-p-test-fix'
2012-05-23 Merge branch 'bp/diff-no-index-strbuf-fix'
2012-05-23 Merge branch 'hv/submodule-alt-odb'
2012-05-20 Merge branch 'maint'
2012-05-17 Merge git://github.com/git-l10n/git-po
2012-05-17 Merge branch 'nd/i18n-parseopt'
2012-05-17 Merge branch 'rs/xdiff-lose-emit-func'
2012-05-09 xdiff: remove emit_func() and xdi_diff_hunks()
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02 Merge branch 'pt/gitk'
2012-03-26 Merge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16 Merge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-03-12 Merge branch 'jc/maint-diff-patch-header' into maint
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2012-02-16 Merge branch 'mm/empty-loose-error-message' into maint
2012-02-13 Merge branch 'mm/empty-loose-error-message'
2012-01-29 Merge branch 'rs/diff-postimage-in-context'
2012-01-27 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-09 Merge branch 'mm/maint-gitweb-project-maxdepth'
2011-12-28 Merge branch 'jc/checkout-m-twoway' into maint
2011-12-28 Merge branch 'tr/doc-sh-setup' into maint
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-28 Merge branch 'jk/maint-snprintf-va-copy' into maint
2011-12-22 Merge branch 'tr/doc-sh-setup'
2011-12-22 Merge branch 'tr/pty-all'
2011-12-22 Merge branch 'jk/maint-strbuf-missing-init'
2011-12-21 Merge branch 'jl/submodule-status-failure-report' into...
2011-12-21 Merge branch 'tr/userdiff-c-returns-pointer' into maint
2011-12-21 Merge branch 'ms/commit-cc-option-helpstring' into...
2011-12-20 Merge branch 'jc/checkout-m-twoway'
2011-12-20 Merge branch 'jc/checkout-m-twoway'
2011-12-20 Merge branch 'jk/maint-snprintf-va-copy'
2011-12-18 Update jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17 Merge git://ozlabs.org/~paulus/gitk
2011-12-14 Merge branch 'jl/submodule-status-failure-report'
2011-12-14 Merge branch 'tr/userdiff-c-returns-pointer'
2011-12-14 Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
2011-12-14 Merge branch 'jc/maint-name-rev-all' into maint-1.7.6
2011-12-14 Merge branch 'ml/mailmap' into maint-1.7.6
2011-12-14 Merge branch 'master' of git://repo.or.cz/git-gui
2011-12-05 Merge branch 'nd/maint-ignore-exclude'
2011-11-28 Merge branch 'nd/maint-ignore-exclude' into nd/ignore...
2011-11-23 Merge branch 'maint' into tj/imap-send-remove-unused
2011-11-21 Merge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-18 Merge branch 'jc/maint-name-rev-all' into maint
2011-11-18 Merge branch 'ml/mailmap' into maint
2011-11-18 Merge branch 'jn/maint-notes-avoid-va-args' into maint
2011-11-12 Merge branch 'ly/mktree-using-strbuf'
2011-11-10 Merge "Move 'builtin-*' into a 'builtin/' subdirectory"
2011-11-10 Merge 'build-in git-mktree'
2011-11-09 Merge branch 'jc/remote-setbranches-usage-fix'
2011-11-09 Merge branch 'fc/remote-seturl-usage-fix'
2011-11-09 Merge branch 'jc/maint-remove-renamed-ref' into maint
2011-11-09 Merge branch 'jm/maint-gitweb-filter-forks-fix' into...
2011-11-08 Merge branch 'ss/blame-textconv-fake-working-tree'
2011-11-01 Merge branch 'md/smtp-tls-hello-again' into maint
2011-11-01 Merge branch 'jk/pull-rebase-with-work-tree' into maint
next