Andrew's git - gitweb.git/history

[gitweb.git] / merge.c

2014-08-26	Merge branch 'jk/diff-tree-t-fix'	blob \| diff \| raw
2014-08-26	Merge branch 'jk/pack-shallow-always-without-bitmap'	blob \| diff \| raw
2014-08-26	Merge branch 'jk/fix-profile-feedback-build'	blob \| diff \| raw
2014-08-10	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| diff \| raw
2014-08-04	Merge branch 'tf/maint-doc-push'	blob \| diff \| raw
2014-08-04	Merge branch 'ta/doc-config'	blob \| diff \| raw
2014-08-04	Merge remote-tracking branch 'sv/nafmo/master'	blob \| diff \| raw
2014-07-30	Sync with 2.0.4	blob \| diff \| raw
2014-07-30	Merge branch 'jk/more-push-completion'	blob \| diff \| raw
2014-07-30	Merge branch 'sk/mingw-uni-fix-more'	blob \| diff \| raw
2014-07-30	Merge branch 'ep/avoid-test-a-o'	blob \| diff \| raw
2014-07-28	Merge branch 'maint'	blob \| diff \| raw
2014-07-28	Merge branch 'jk/misc-fixes-maint'	blob \| diff \| raw
2014-07-27	Merge branch 'jk/rebase-am-fork-point'	blob \| diff \| raw
2014-07-27	Merge branch 'cc/replace-graft'	blob \| diff \| raw
2014-07-27	Merge branch 'jk/stable-prio-queue'	blob \| diff \| raw
2014-07-23	Sync with v2.0.3	blob \| diff \| raw
2014-07-23	Merge branch 'rs/fix-unlink-unix-socket'	blob \| diff \| raw
2014-07-23	Merge branch 'ta/string-list-init'	blob \| diff \| raw
2014-07-23	Merge branch 'jk/tag-sort'	blob \| diff \| raw
2014-07-22	Sync with maint	blob \| diff \| raw
2014-07-22	Merge branch 'rs/code-cleaning'	blob \| diff \| raw
2014-07-22	Merge branch 'nd/path-max-must-go'	blob \| diff \| raw
2014-07-22	Merge branch 'jk/alloc-commit-id'	blob \| diff \| raw
2014-07-22	Merge branch 'kb/perf-trace'	blob \| diff \| raw
2014-07-21	Merge branch 'maint'	blob \| diff \| raw
2014-07-21	Merge branch 'rs/unify-is-branch'	blob \| diff \| raw
2014-07-21	Merge branch 'kb/avoid-fchmod-for-now'	blob \| diff \| raw
2014-07-21	Merge branch 'sk/mingw-uni-fix'	blob \| diff \| raw
2014-07-21	Merge branch 'ek/alt-odb-entry-fix'	blob \| diff \| raw
2014-07-21	Merge branch 'kb/hashmap-updates'	blob \| diff \| raw
2014-07-21	Merge branch 'jk/remote-curl-squelch-extra-errors'	blob \| diff \| raw
2014-07-21	Merge branch 'rs/ref-transaction-0'	blob \| diff \| raw
2014-07-21	Merge branch 'jl/submodule-tests'	blob \| diff \| raw
2014-07-21	Merge branch 'ak/profile-feedback-build'	blob \| diff \| raw
2014-07-21	Merge branch 'cc/for-each-mergetag'	blob \| diff \| raw
2014-07-16	Sync with 2.0.2	blob \| diff \| raw
2014-07-16	Merge branch 'ah/fix-http-push'	blob \| diff \| raw
2014-07-16	Merge branch 'rs/code-cleaning'	blob \| diff \| raw
2014-07-16	Merge branch 'jk/skip-prefix'	blob \| diff \| raw
2014-07-16	Merge branch 'po/error-message-style'	blob \| diff \| raw
2014-07-16	Merge branch 'jl/test-lint-scripts'	blob \| diff \| raw
2014-07-16	Merge branch 'zk/log-graph-showsig'	blob \| diff \| raw
2014-07-16	Merge branch 'mg/fix-log-mergetag-color'	blob \| diff \| raw
2014-07-16	Merge branch 'kb/path-max-must-go'	blob \| diff \| raw
2014-07-16	Merge branch 'cb/filter-branch-prune-empty-degenerate...	blob \| diff \| raw
2014-07-16	Merge branch 'mk/merge-incomplete-files'	blob \| diff \| raw
2014-07-16	Merge branch 'jk/strip-suffix'	blob \| diff \| raw
2014-07-16	Merge branch 'ep/submodule-code-cleanup'	blob \| diff \| raw
2014-07-16	Merge branch 'jk/replace-edit-raw'	blob \| diff \| raw
2014-07-16	Merge branch 'cc/replace-edit'	blob \| diff \| raw
2014-07-16	Merge branch 'tb/crlf-tests'	blob \| diff \| raw
2014-07-16	Merge branch 'nd/split-index'	blob \| diff \| raw
2014-07-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2014-07-10	Merge branch 'dt/refs-check-refname-component-sse-fix'	blob \| diff \| raw \| diff to current
2014-07-10	Merge branch 'rs/simplify-archive-tests'	blob \| diff \| raw \| diff to current
2014-07-10	Merge branch 'rs/fix-alt-odb-path-comparison'	blob \| diff \| raw \| diff to current
2014-07-10	Merge branch 'rs/status-code-clean-up'	blob \| diff \| raw \| diff to current
2014-07-10	Merge branch 'kb/path-max-must-go'	blob \| diff \| raw \| diff to current
2014-07-10	Merge branch 'mg/verify-commit'	blob \| diff \| raw \| diff to current
2014-07-10	Merge branch 'jc/fix-clone-single-starting-at-a-tag'	blob \| diff \| raw \| diff to current
2014-07-09	Merge branch 'sk/mingw-unicode-spawn-args'	blob \| diff \| raw \| diff to current
2014-07-09	Merge branch 'sk/mingw-dirent'	blob \| diff \| raw \| diff to current
2014-07-09	Merge branch 'sk/mingw-uni-console'	blob \| diff \| raw \| diff to current
2014-07-09	Merge branch 'sk/mingw-main'	blob \| diff \| raw \| diff to current
2014-07-09	Merge branch 'jk/pretty-G-format-fixes'	blob \| diff \| raw \| diff to current
2014-07-09	Merge branch 'jk/xstrfmt'	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-06-19	merge: use argv_array when spawning merge strategy	blob \| diff \| raw \| diff to current
2014-06-13	read-cache: new API write_locked_index instead of write...	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-03-18	Merge branch 'jc/check-attr-honor-working-tree' into...	blob \| diff \| raw \| diff to current
2014-03-18	Merge branch 'jk/config-path-include-fix' into maint	blob \| diff \| raw \| diff to current
2014-03-14	Merge branch 'jc/check-attr-honor-working-tree'	blob \| diff \| raw \| diff to current
2014-02-27	Merge branch 'bs/stdio-undef-before-redef'	blob \| diff \| raw \| diff to current
2014-02-27	Merge branch 'jk/config-path-include-fix'	blob \| diff \| raw \| diff to current
2014-02-13	Merge branch 'jc/revision-range-unpeel' into maint	blob \| diff \| raw \| diff to current
2014-01-27	Merge branch 'jc/revision-range-unpeel'	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-17	Merge branch 'jk/two-way-merge-corner-case-fix' 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-12-05	Merge branch 'jk/two-way-merge-corner-case-fix'	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-07	Merge branch 'jc/revision-range-unpeel' 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-30	Merge branch 'sg/t3600-nul-sha1-fix'	blob \| diff \| raw \| diff to current
2013-10-28	Merge branch 'ew/keepalive'	blob \| diff \| raw \| diff to current
2013-10-28	Merge branch 'jc/revision-range-unpeel'	blob \| diff \| raw \| diff to current
2013-10-14	Merge branch 'rj/highlight-test-hang'	blob \| diff \| raw \| diff to current
2013-10-14	Merge branch 'nv/doc-config-signingkey'	blob \| diff \| raw \| diff to current
2013-09-26	Merge branch 'js/xread-in-full' into maint	blob \| diff \| raw \| diff to current
2013-09-12	Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'	blob \| diff \| raw \| diff to current
2013-09-11	Merge branch 'js/xread-in-full'	blob \| diff \| raw \| diff to current
next