Andrew's git - gitweb.git/history

[gitweb.git] / mergetools / emerge

2015-01-07	Merge branch 'nd/lockfile-absolute'	blob \| diff \| raw
2015-01-07	Merge branch 'jc/merge-bases'	blob \| diff \| raw
2015-01-07	Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'	blob \| diff \| raw
2015-01-07	Merge branch 'jc/diff-b-m'	blob \| diff \| raw
2015-01-07	Merge branch 'jc/clone-borrow'	blob \| diff \| raw
2015-01-07	Merge branch 'jc/checkout-local-track-report'	blob \| diff \| raw
2014-12-29	Merge branch 'for-junio' of git://bogomips.org/git-svn	blob \| diff \| raw
2014-12-29	Merge branch 'jc/t9001-modernise'	blob \| diff \| raw
2014-12-29	Merge branch 'mh/update-ref-verify'	blob \| diff \| raw
2014-12-22	Sync with maint	blob \| diff \| raw
2014-12-22	Merge branch 'rs/use-strbuf-complete-line'	blob \| diff \| raw
2014-12-22	Merge branch 'jg/prompt-localize-temporary'	blob \| diff \| raw
2014-12-22	Merge branch 'ch/new-gpg-drops-rfc-1991'	blob \| diff \| raw
2014-12-22	Merge branch 'jk/commit-date-approxidate'	blob \| diff \| raw
2014-12-22	Merge branch 'nd/split-index'	blob \| diff \| raw
2014-12-22	Merge branch 'jk/test-asan'	blob \| diff \| raw
2014-12-22	Merge branch 'ok/rebase-i-count-todo'	blob \| diff \| raw
2014-12-22	Merge branch 'jk/read-packed-refs-without-path-max'	blob \| diff \| raw
2014-12-22	Merge branch 'jk/always-allow-large-packets'	blob \| diff \| raw
2014-12-22	Merge branch 'jk/colors'	blob \| diff \| raw
2014-12-22	Merge branch 'rw/apply-does-not-take-ignore-date'	blob \| diff \| raw
2014-12-22	Merge branch 'js/test-hashmap-squelch-gcc'	blob \| diff \| raw
2014-12-22	Merge branch 'js/fsck-tag-validation'	blob \| diff \| raw
2014-12-22	Merge branch 'po/doc-assume-unchanged'	blob \| diff \| raw
2014-12-22	Merge branch 'mg/branch-d-m-f'	blob \| diff \| raw
2014-12-22	Merge branch 'tb/t0027-eol-conversion'	blob \| diff \| raw
2014-12-22	Merge branch 'jk/for-each-reflog-ent-reverse'	blob \| diff \| raw
2014-12-22	Merge branch 'sb/string-list'	blob \| diff \| raw
2014-12-22	Merge branch 'sv/doc-stripspace'	blob \| diff \| raw
2014-12-22	Merge branch 'rt/completion-tag'	blob \| diff \| raw
2014-12-22	Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'	blob \| diff \| raw
2014-12-22	Merge branch 'jk/credential-quit'	blob \| diff \| raw
2014-12-22	Merge branch 'dm/compat-s-ifmt-for-zos'	blob \| diff \| raw
2014-12-22	Merge branch 'ps/new-workdir-into-empty-directory'	blob \| diff \| raw
2014-12-22	Merge branch 'nd/ls-tree-pathspec'	blob \| diff \| raw
2014-12-22	Merge branch 'jc/hook-cleanup'	blob \| diff \| raw
2014-12-22	Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'	blob \| diff \| raw
2014-12-22	Merge branch 'rj/t0050-passes'	blob \| diff \| raw
2014-12-22	Merge branch 'js/push-to-deploy'	blob \| diff \| raw
2014-12-22	Merge branch 'jc/exec-cmd-system-path-leak-fix'	blob \| diff \| raw
2014-12-22	Merge branch 'mh/find-uniq-abbrev'	blob \| diff \| raw
2014-12-22	Merge branch 'pb/send-email-te'	blob \| diff \| raw
2014-12-22	Merge branch 'pb/am-message-id-footer'	blob \| diff \| raw
2014-12-22	Merge branch 'mh/simplify-repack-without-refs'	blob \| diff \| raw
2014-12-22	Merge branch 'dw/shell-basename-dashdash-before-strippi...	blob \| diff \| raw
2014-12-22	Merge branch 'rj/no-xopen-source-for-cygwin'	blob \| diff \| raw
2014-12-22	Merge branch 'js/t5000-dont-copy-bin-sh'	blob \| diff \| raw
2014-12-22	Merge branch 'jc/refer-to-t-readme-from-submitting...	blob \| diff \| raw
2014-12-22	Merge branch 'tb/config-core-filemode-check-on-broken-fs'	blob \| diff \| raw
2014-12-22	Merge branch 'mg/add-ignore-errors'	blob \| diff \| raw
2014-12-22	Merge branch 'jk/lock-ref-sha1-basic-return-errors'	blob \| diff \| raw
2014-12-22	Merge branch 'cc/interpret-trailers-more'	blob \| diff \| raw
2014-12-18	Sync with v2.2.1	blob \| diff \| raw
2014-12-12	Merge branch 'jk/pack-bitmap'	blob \| diff \| raw
2014-12-12	Merge branch 'jk/push-simple'	blob \| diff \| raw
2014-12-12	Merge branch 'da/difftool-mergetool-simplify-reporting...	blob \| diff \| raw
2014-11-21	mergetools: stop setting $status in merge_cmd()	blob \| diff \| raw
2014-11-18	Merge branch 'jc/doc-commit-only'	blob \| diff \| raw \| diff to current
2014-10-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-10-29	Merge branch 'bc/asciidoc-pretty-formats-fix' into...	blob \| diff \| raw \| diff to current
2014-10-14	Merge branch 'bc/asciidoc-pretty-formats-fix'	blob \| diff \| raw \| diff to current
2014-09-30	Merge branch 'sb/merge-recursive-copy-paste-fix'	blob \| diff \| raw \| diff to current
2014-09-26	Merge branch 'sb/help-unknown-command-sort-fix'	blob \| diff \| raw \| diff to current
2014-08-10	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-06-27	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-06-26	Merge early parts from git://ozlabs.org/~paulus/gitk.git	blob \| diff \| raw \| diff to current
2014-06-26	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2014-05-19	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| diff \| raw \| diff to current
2014-02-27	Merge branch 'bs/stdio-undef-before-redef'	blob \| diff \| raw \| diff to current
2014-01-23	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-01-21	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| diff \| raw \| diff to current
2014-01-14	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| diff \| raw \| diff to current
2013-12-09	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2013-12-09	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-11-07	Merge branch 'vd/doc-unpack-objects' into maint	blob \| diff \| raw \| diff to current
2013-11-04	Merge branch 'vd/doc-unpack-objects'	blob \| diff \| raw \| diff to current
2013-10-30	Merge branch 'jk/refs-c-squelch-gcc'	blob \| diff \| raw \| diff to current
2013-10-30	Merge branch 'jk/date-c-double-semicolon'	blob \| diff \| raw \| diff to current
2013-10-28	Merge branch 'ew/keepalive'	blob \| diff \| raw \| diff to current
2013-10-14	Merge branch 'rj/highlight-test-hang'	blob \| diff \| raw \| diff to current
2013-06-17	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2013-05-17	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-05-13	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jk/checkout-attribute-lookup' into maint...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'jk/checkout-attribute-lookup'	blob \| diff \| raw \| diff to current
2013-03-26	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'ap/maint-diff-rename-avoid-overlap'	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'ob/imap-send-ssl-verify'	blob \| diff \| raw \| diff to current
2013-02-20	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| diff \| raw \| diff to current
2013-02-04	Merge branch 'dl/am-hg-locale' into maint	blob \| diff \| raw \| diff to current
2013-01-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-01-28	Merge branch 'dl/am-hg-locale'	blob \| diff \| raw \| diff to current
2013-01-23	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/maint-fast-import-doc-reorder' into...	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/maint-fast-import-doc-dedup-done'...	blob \| diff \| raw \| diff to current
next