Merge branch 'cc/bisect-rev-parsing'
[gitweb.git] / mergetools / diffmerge
2015-01-12 Merge branch 'cc/bisect-rev-parsing'
2015-01-07 Merge branch 'maint'
2015-01-07 Merge branch 'bw/maint-0090-awk-tweak'
2015-01-07 Merge branch 'jh/pre-push-sample-no-custom-ifs'
2015-01-07 Merge branch 'tf/prompt-preserve-exit-status'
2015-01-07 Merge branch 'sb/dco-indentation-fix'
2015-01-07 Merge branch 'bb/update-unicode-table'
2015-01-07 Merge branch 'es/squelch-openssl-warnings-on-macosx'
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2015-01-07 Merge branch 'lh/send-email-hide-x-mailer'
2015-01-07 Merge branch 'rd/send-email-2047-fix'
2015-01-07 Merge branch 'pd/completion-filenames-fix'
2015-01-07 Merge branch 'jk/add-i-read-error'
2015-01-07 Merge branch 'jk/approxidate-avoid-y-d-m-over-future...
2015-01-07 Merge branch 'br/imap-send-via-libcurl'
2015-01-07 Merge branch 'br/imap-send-verbosity'
2015-01-07 Merge branch 'nd/lockfile-absolute'
2015-01-07 Merge branch 'jc/merge-bases'
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-29 Merge branch 'for-junio' of git://bogomips.org/git-svn
2014-12-29 Merge branch 'jc/t9001-modernise'
2014-12-29 Merge branch 'mh/update-ref-verify'
2014-12-22 Sync with maint
2014-12-22 Merge branch 'rs/use-strbuf-complete-line'
2014-12-22 Merge branch 'jg/prompt-localize-temporary'
2014-12-22 Merge branch 'ch/new-gpg-drops-rfc-1991'
2014-12-22 Merge branch 'jk/commit-date-approxidate'
2014-12-22 Merge branch 'nd/split-index'
2014-12-22 Merge branch 'jk/test-asan'
2014-12-22 Merge branch 'ok/rebase-i-count-todo'
2014-12-22 Merge branch 'jk/read-packed-refs-without-path-max'
2014-12-22 Merge branch 'jk/always-allow-large-packets'
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 'tb/t0027-eol-conversion'
2014-12-22 Merge branch 'jk/for-each-reflog-ent-reverse'
2014-12-22 Merge branch 'sb/string-list'
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 'ps/new-workdir-into-empty-directory'
2014-12-22 Merge branch 'nd/ls-tree-pathspec'
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 'js/push-to-deploy'
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 'pb/send-email-te'
2014-12-22 Merge branch 'pb/am-message-id-footer'
2014-12-22 Merge branch 'mh/simplify-repack-without-refs'
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 'mg/add-ignore-errors'
2014-12-22 Merge branch 'jk/lock-ref-sha1-basic-return-errors'
2014-12-22 Merge branch 'cc/interpret-trailers-more'
2014-12-18 Sync with v2.2.1
2014-12-12 Merge branch 'jk/pack-bitmap'
2014-12-12 Merge branch 'jk/push-simple'
2014-12-12 Merge branch 'da/difftool-mergetool-simplify-reporting...
2014-11-21 mergetools: stop setting $status in merge_cmd()
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-11 Merge branch 'rs/clean-menu-item-defn' into maint
2014-11-06 Merge branch 'tm/line-log-first-parent'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
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-09-09 Merge branch 'rs/clean-menu-item-defn'
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-06-25 Merge branch 'rr/rebase-autostash-fix' into maint
2014-06-25 Merge branch 'jc/shortlog-ref-exclude' into maint
2014-06-20 Merge branch 'tb/t5551-clone-notice-to-stderr'
2014-06-16 Merge branch 'rr/rebase-autostash-fix'
2014-06-09 Merge branch 'jc/shortlog-ref-exclude'
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-08 Merge branch 'cl/p4-use-diff-tree' into maint
2014-05-07 Merge branch 'cl/p4-use-diff-tree'
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
2014-04-03 Merge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03 Merge branch 'jc/stash-pop-not-popped' into maint
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
next