Andrew's git - gitweb.git/history

[gitweb.git] / git-mergetool.sh

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-22	Merge branch 'jk/rebuild-perl-scripts-with-no-perl...	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'po/everyday-doc' into maint	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'jk/push-simple' into maint	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'mh/config-flip-xbit-back-after-checking...	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'jk/gitweb-with-newer-cgi-multi-param...	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'rs/receive-pack-use-labs' into maint	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'rs/maint-config-use-labs' into maint	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'js/windows-open-eisdir-error' into maint	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'jk/colors-fix' into maint	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'jk/checkout-from-tree' into maint	blob \| diff \| raw \| diff to current
2014-12-18	Sync with v2.2.1	blob \| diff \| raw
2014-12-17	Sync with v2.1.4	blob \| diff \| raw \| diff to current
2014-12-17	Sync with v2.0.5	blob \| diff \| raw \| diff to current
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-12-12	Merge branch 'jk/colors-fix'	blob \| diff \| raw \| diff to current
2014-12-12	Merge branch 'rt/push-recurse-submodule-usage-string'	blob \| diff \| raw \| diff to current
2014-12-12	Merge branch 'jk/rebuild-perl-scripts-with-no-perl...	blob \| diff \| raw \| diff to current
2014-12-12	Merge branch 'sv/typofix-apply-error-message'	blob \| diff \| raw \| diff to current
2014-12-12	Merge branch 'po/everyday-doc'	blob \| diff \| raw \| diff to current
2014-12-12	Merge branch 'jc/unpack-trees-plug-leak'	blob \| diff \| raw \| diff to current
2014-12-05	Merge branch 'mh/config-flip-xbit-back-after-checking'	blob \| diff \| raw \| diff to current
2014-12-05	Merge branch 'jk/gitweb-with-newer-cgi-multi-param'	blob \| diff \| raw \| diff to current
2014-12-05	Merge branch 'rs/receive-pack-use-labs'	blob \| diff \| raw \| diff to current
2014-12-05	Merge branch 'rs/maint-config-use-labs'	blob \| diff \| raw \| diff to current
2014-12-05	Merge branch 'js/windows-open-eisdir-error'	blob \| diff \| raw \| diff to current
2014-12-05	Merge branch 'sv/get-builtin'	blob \| diff \| raw \| diff to current
2014-12-05	Merge branch 'jk/checkout-from-tree'	blob \| diff \| raw \| diff to current
2014-11-21	mergetool: simplify conditionals	blob \| diff \| raw
2014-11-19	Merge branch 'sv/submitting-final-patch'	blob \| diff \| raw \| diff to current
2014-11-19	Merge branch 'sn/tutorial-status-output-example'	blob \| diff \| raw \| diff to current
2014-11-19	Merge branch 'mh/doc-remote-helper-xref'	blob \| diff \| raw \| diff to current
2014-11-19	Merge branch 'tb/no-relative-file-url'	blob \| diff \| raw \| diff to current
2014-11-19	Merge branch 'cc/interpret-trailers'	blob \| diff \| raw \| diff to current
2014-11-18	Merge branch 'jc/doc-commit-only'	blob \| diff \| raw \| diff to current
2014-11-18	Merge branch 'da/difftool'	blob \| diff \| raw \| diff to current
2014-11-12	Sync with 'maint'	blob \| diff \| raw \| diff to current
2014-11-12	Merge branch 'nd/gitignore-trailing-whitespace' into...	blob \| diff \| raw \| diff to current
2014-11-12	Merge branch 'jk/fetch-reflog-df-conflict'	blob \| diff \| raw \| diff to current
2014-11-11	Sync with maint	blob \| diff \| raw \| diff to current
2014-11-11	Merge branch 'rs/clean-menu-item-defn' into maint	blob \| diff \| raw \| diff to current
2014-11-10	Sync with maint	blob \| diff \| raw \| diff to current
2014-11-10	Merge branch 'js/diff-highlight-avoid-sigpipe'	blob \| diff \| raw \| diff to current
2014-11-10	Merge branch 'jc/conflict-hint' into cc/interpret-trail...	blob \| diff \| raw \| diff to current
2014-11-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2014-11-06	Merge branch 'nd/gitignore-trailing-whitespace'	blob \| diff \| raw \| diff to current
2014-11-06	Merge branch 'tm/line-log-first-parent'	blob \| diff \| raw \| diff to current
2014-11-06	Merge branch 'jk/fetch-reflog-df-conflict'	blob \| diff \| raw \| diff to current
2014-11-06	Merge branch 'jk/cache-tree-protect-from-broken-libgit2'	blob \| diff \| raw \| diff to current
2014-10-31	Merge branch 'jc/push-cert'	blob \| diff \| raw \| diff to current
2014-10-31	Merge branch 'rs/child-process-init'	blob \| diff \| raw \| diff to current
2014-10-31	Merge branch 'rs/grep-color-words'	blob \| diff \| raw \| diff to current
2014-10-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-10-29	Sync with Git 2.1.3	blob \| diff \| raw \| diff to current
2014-10-29	Merge branch 'jk/pack-objects-no-bitmap-when-splitting...	blob \| diff \| raw \| diff to current
next