transport-helper: mismerge fix
[gitweb.git] / xdiff / xdiffi.h
2013-07-22 Merge branch 'jx/clean-interactive'
2013-07-22 Merge branch 'hv/config-from-blob'
2013-07-22 Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'
2013-07-22 Merge branch 'jk/t0008-sigpipe-fix'
2013-07-22 Merge branch 'jk/gcc-function-attributes'
2013-07-22 Merge branch 'db/show-ref-head'
2013-07-22 Merge branch 'es/blame-L-breakage'
2013-07-22 Merge branch 'tr/protect-low-3-fds'
2013-07-22 Merge branch 'sb/parse-object-buffer-eaten'
2013-07-22 Merge branch 'tr/do-not-call-submodules-subprojects'
2013-07-22 Merge branch 'mm/diff-no-patch-synonym-to-s'
2013-07-22 Merge branch 'dw/request-pull-diag'
2013-07-22 Merge branch 'jc/mailmap-case-insensitivity'
2013-07-22 Merge branch 'tr/fd-gotcha-fixes'
2013-07-22 Merge branch 'mm/color-auto-default'
2013-07-22 Merge branch 'jc/simple-add-must-be-a-no-op'
2013-07-22 Sync with maint
2013-07-19 Sync with maint
2013-07-18 Merge branch 'jk/in-pack-size-measurement'
2013-07-18 Merge branch 'bp/mediawiki-preview'
2013-07-18 Merge branch 'bc/commit-invalid-utf8'
2013-07-18 Merge branch 'es/overlapping-range-set'
2013-07-18 Merge branch 'jk/maint-clone-shared-no-connectivity...
2013-07-18 Merge branch 'bc/push-match-many-refs'
2013-07-18 Merge branch 'rr/rebase-reflog-message-reword'
2013-07-15 Sync with 1.8.3.3
2013-07-15 Merge branch 'bc/send-email-use-port-as-separate-param'
2013-07-15 Merge branch 'fg/submodule-clone-depth'
2013-07-15 Merge branch 'cp/submodule-custom-update'
2013-07-12 Merge branch 'jc/remote-http-argv-array'
2013-07-12 Merge branch 'rs/pickaxe-simplify'
2013-07-12 Merge branch 'tr/test-lint-no-export-assignment-in...
2013-07-12 Merge branch 'rr/name-rev-stdin-doc'
2013-07-12 Merge branch 'ft/diff-rename-default-score-is-half'
2013-07-12 Merge branch 'ml/cygwin-does-not-have-fifo'
2013-07-12 Merge branch 'ms/remote-tracking-branches-in-doc'
2013-07-12 Merge branch 'jk/pull-to-integrate'
2013-07-12 Merge branch 'jk/maint-config-multi-order'
2013-07-12 Merge branch 'as/log-output-encoding-in-user-format'
2013-07-11 Merge branch 'jc/t1512-fix'
2013-07-11 Merge branch 'tr/test-v-and-v-subtest-only'
2013-07-11 Merge branch 'af/rebase-i-merge-options'
2013-07-11 Merge branch 'pb/stash-refuse-to-kill'
2013-07-11 Merge branch 'jc/maint-diff-core-safecrlf'
2013-07-11 Merge branch 'jg/status-config'
2013-07-11 Merge branch 'rr/rebase-checkout-reflog'
2013-07-11 Merge branch 'jc/triangle-push-fixup'
2013-07-11 Merge branch 'mh/maint-lockfile-overflow'
2013-07-05 Merge branch 'maint'
2013-07-05 Merge branch 'tr/test-v-and-v-subtest-only'
2013-07-03 Merge branch 'maint'
2013-07-01 Merge branch 'maint'
2013-07-01 Merge branch 'rr/remote-branch-config-refresh'
2013-07-01 Merge branch 'ed/color-prompt'
2013-07-01 Merge branch 'ap/rebase-multiple-fixups'
2013-07-01 Merge branch 'kb/am-deprecate-resolved'
2013-07-01 Merge branch 'rr/column-doc'
2013-07-01 Merge branch 'ft/doc-git-transport'
2013-07-01 Merge branch 'sb/mailmap-merijn-brand'
2013-07-01 Merge branch 'sg/bash-prompt'
2013-07-01 Merge branch 'wk/doc-in-linux-3.x-era'
2013-07-01 Merge branch 'jc/topo-author-date-sort'
2013-07-01 Merge branch 'jk/commit-info-slab'
2013-06-30 Merge branch 'maint'
2013-06-30 Merge branch 'mh/ref-races'
2013-06-30 Merge branch 'ap/diff-ignore-blank-lines'
2013-06-19 diff: add --ignore-blank-lines option
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-04-03 Merge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03 Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-01 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28 Merge branch 'jk/checkout-attribute-lookup'
2013-03-26 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-03-25 Merge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-21 Merge branch 'ob/imap-send-ssl-verify'
2013-02-20 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-02-04 Merge branch 'dl/am-hg-locale' into maint
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-28 Merge branch 'dl/am-hg-locale'
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2013-01-14 Merge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14 Merge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14 Merge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14 Merge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-12 Merge branch 'jk/maint-fast-import-doc-reorder'
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
2013-01-10 Merge branch 'ta/remove-stale-translated-tut' into...
2013-01-10 Merge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-08 Merge branch 'ta/remove-stale-translated-tut'
2013-01-08 Merge branch 'jk/maint-fast-import-doc-dedup-done'
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-08 Merge branch 'os/commit-submodule-ignore' into maint
2012-10-01 Merge branch 'os/commit-submodule-ignore'
2012-09-18 Merge branch 'er/doc-fast-import-done' into maint
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
next