Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'
[gitweb.git] / mergetools / bc3
2015-01-07 Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'
2015-01-07 Merge branch 'jc/diff-b-m'
2015-01-07 Merge branch 'jc/clone-borrow'
2015-01-07 Merge branch 'jc/checkout-local-track-report'
2014-12-22 Merge branch 'rs/use-strbuf-complete-line'
2014-12-22 Merge branch 'jg/prompt-localize-temporary'
2014-12-22 Merge branch 'jk/commit-date-approxidate'
2014-12-22 Merge branch 'nd/split-index'
2014-12-22 Merge branch 'jk/read-packed-refs-without-path-max'
2014-12-22 Merge branch 'jk/colors'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-12-22 Merge branch 'js/test-hashmap-squelch-gcc'
2014-12-22 Merge branch 'js/fsck-tag-validation'
2014-12-22 Merge branch 'po/doc-assume-unchanged'
2014-12-22 Merge branch 'mg/branch-d-m-f'
2014-12-22 Merge branch 'jk/for-each-reflog-ent-reverse'
2014-12-22 Merge branch 'sv/doc-stripspace'
2014-12-22 Merge branch 'rt/completion-tag'
2014-12-22 Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'
2014-12-22 Merge branch 'jk/credential-quit'
2014-12-22 Merge branch 'dm/compat-s-ifmt-for-zos'
2014-12-22 Merge branch 'jc/hook-cleanup'
2014-12-22 Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'
2014-12-22 Merge branch 'rj/t0050-passes'
2014-12-22 Merge branch 'jc/exec-cmd-system-path-leak-fix'
2014-12-22 Merge branch 'mh/find-uniq-abbrev'
2014-12-22 Merge branch 'dw/shell-basename-dashdash-before-strippi...
2014-12-22 Merge branch 'rj/no-xopen-source-for-cygwin'
2014-12-22 Merge branch 'js/t5000-dont-copy-bin-sh'
2014-12-22 Merge branch 'jc/refer-to-t-readme-from-submitting...
2014-12-22 Merge branch 'tb/config-core-filemode-check-on-broken-fs'
2014-12-22 Merge branch 'cc/interpret-trailers-more'
2014-12-22 Merge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-22 Merge branch 'po/everyday-doc' into maint
2014-12-22 Merge branch 'jk/push-simple' into maint
2014-12-22 Merge branch 'mh/config-flip-xbit-back-after-checking...
2014-12-22 Merge branch 'jk/gitweb-with-newer-cgi-multi-param...
2014-12-22 Merge branch 'rs/receive-pack-use-labs' into maint
2014-12-22 Merge branch 'rs/maint-config-use-labs' into maint
2014-12-22 Merge branch 'js/windows-open-eisdir-error' into maint
2014-12-22 Merge branch 'jk/colors-fix' into maint
2014-12-22 Merge branch 'jk/checkout-from-tree' into maint
2014-12-17 Sync with v2.1.4
2014-12-12 Merge branch 'jk/pack-bitmap'
2014-12-12 Merge branch 'jk/push-simple'
2014-12-12 Merge branch 'jk/colors-fix'
2014-12-12 Merge branch 'rt/push-recurse-submodule-usage-string'
2014-12-12 Merge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-12 Merge branch 'sv/typofix-apply-error-message'
2014-12-12 Merge branch 'po/everyday-doc'
2014-12-12 Merge branch 'jc/unpack-trees-plug-leak'
2014-12-05 Merge branch 'mh/config-flip-xbit-back-after-checking'
2014-12-05 Merge branch 'jk/gitweb-with-newer-cgi-multi-param'
2014-12-05 Merge branch 'rs/receive-pack-use-labs'
2014-12-05 Merge branch 'rs/maint-config-use-labs'
2014-12-05 Merge branch 'js/windows-open-eisdir-error'
2014-12-05 Merge branch 'sv/get-builtin'
2014-12-05 Merge branch 'jk/checkout-from-tree'
2014-11-19 Merge branch 'sv/submitting-final-patch'
2014-11-19 Merge branch 'sn/tutorial-status-output-example'
2014-11-19 Merge branch 'mh/doc-remote-helper-xref'
2014-11-19 Merge branch 'tb/no-relative-file-url'
2014-11-19 Merge branch 'cc/interpret-trailers'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-18 Merge branch 'da/difftool'
2014-11-12 Sync with 'maint'
2014-11-12 Merge branch 'jk/fetch-reflog-df-conflict'
2014-11-11 Sync with maint
2014-11-10 Sync with maint
2014-11-10 Merge branch 'js/diff-highlight-avoid-sigpipe'
2014-11-06 Merge branch 'maint'
2014-11-06 Merge branch 'nd/gitignore-trailing-whitespace'
2014-11-06 Merge branch 'tm/line-log-first-parent'
2014-11-06 Merge branch 'jk/fetch-reflog-df-conflict'
2014-11-06 Merge branch 'rs/use-child-process-init-more'
2014-11-06 Merge branch 'jk/cache-tree-protect-from-broken-libgit2'
2014-10-31 Merge branch 'for-junio' of git://bogomips.org/git-svn
2014-10-31 Merge branch 'jc/push-cert'
2014-10-31 Merge branch 'rs/child-process-init'
2014-10-31 Merge branch 'rs/grep-color-words'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Sync with Git 2.1.3
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29 Merge branch 'da/difftool'
2014-10-29 Merge branch 'rb/pack-window-memory-config-doc'
2014-10-29 Merge branch 'mg/lib-gpg-ro-safety'
2014-10-29 Merge branch 'dm/port2zos'
2014-10-29 Merge branch 'oc/mergetools-beyondcompare'
2014-10-21 mergetool: rename bc3 to bc
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Merge git://repo.or.cz/git-gui
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-02-27 Merge branch 'bs/stdio-undef-before-redef'
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
next