Andrew's git - gitweb.git/history

[gitweb.git] / merge.c

2013-01-14	Merge branch 'jk/unify-exit-code-by-receiving-signal...	blob \| diff \| raw
2013-01-14	Merge branch 'jn/xml-depends-on-asciidoc-conf' into...	blob \| diff \| raw
2013-01-14	Merge branch 'jk/maint-fast-import-doc-reorder' into...	blob \| diff \| raw
2013-01-14	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| diff \| raw
2013-01-14	Merge branch 'jk/maint-fast-import-doc-dedup-done'...	blob \| diff \| raw
2013-01-14	Merge branch 'rs/leave-base-name-in-name-field-of-tar...	blob \| diff \| raw
2013-01-14	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| diff \| raw
2013-01-14	Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credi...	blob \| diff \| raw
2013-01-14	Merge branch 'jc/apply-trailing-blank-removal' into...	blob \| diff \| raw
2013-01-14	Merge branch 'pf/editor-ignore-sigint' into maint	blob \| diff \| raw
2013-01-14	Merge branch 'mk/maint-graph-infinity-loop' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'jk/maint-fast-import-doc-reorder'	blob \| diff \| raw
2013-01-12	Merge branch 'jk/shortlog-no-wrap-doc'	blob \| diff \| raw
2013-01-12	Merge branch 'rs/zip-with-uncompressed-size-in-the...	blob \| diff \| raw
2013-01-12	Merge branch 'rs/zip-tests'	blob \| diff \| raw
2013-01-12	Merge branch 'jn/xml-depends-on-asciidoc-conf'	blob \| diff \| raw
2013-01-12	Merge branch 'jk/unify-exit-code-by-receiving-signal'	blob \| diff \| raw
2013-01-12	Merge branch 'jc/format-patch-reroll'	blob \| diff \| raw
2013-01-12	Merge branch 'as/api-allocation-doc' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'ap/merge-stop-at-prepare-commit-msg-failu...	blob \| diff \| raw
2013-01-12	Merge branch 'jc/submittingpatches' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'os/gitweb-highlight-uncaptured' into...	blob \| diff \| raw
2013-01-12	Merge branch 'jn/less-reconfigure' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'kb/maint-bundle-doc' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'as/test-name-alias-uniquely' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'jn/warn-on-inaccessible-loosen' into...	blob \| diff \| raw
2013-01-12	Merge branch 'jc/fetch-ignore-symref' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'ss/svn-prompt' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'ta/remove-stale-translated-tut' into...	blob \| diff \| raw
2013-01-10	Merge branch 'tb/test-t9810-no-sed-i' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'tb/test-t9020-no-which' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'mh/pthreads-autoconf' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'jc/same-encoding' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'sp/shortlog-missing-lf' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'md/gitweb-sort-by-age' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'nd/invalidate-i-t-a-cache-tree' into...	blob \| diff \| raw
2013-01-10	Merge branch 'jk/repack-ref-racefix' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'rb/http-cert-cred-no-username-prompt...	blob \| diff \| raw
2013-01-10	Merge branch 'as/api-allocation-doc'	blob \| diff \| raw
2013-01-10	Merge branch 'rs/leave-base-name-in-name-field-of-tar'	blob \| diff \| raw
2013-01-10	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| diff \| raw
2013-01-10	Merge branch 'as/dir-c-cleanup'	blob \| diff \| raw
2013-01-10	Merge branch 'nd/wildmatch'	blob \| diff \| raw
2013-01-10	Merge branch 'aw/rebase-am-failure-detection'	blob \| diff \| raw
2013-01-10	Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'	blob \| diff \| raw
2013-01-09	Merge branch 'nd/maint-branch-desc-doc'	blob \| diff \| raw
2013-01-09	Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'	blob \| diff \| raw
2013-01-09	Merge branch 'fc/remote-bzr'	blob \| diff \| raw
2013-01-09	Merge branch 'jc/submittingpatches'	blob \| diff \| raw
2013-01-09	Merge branch 'os/gitweb-highlight-uncaptured'	blob \| diff \| raw
2013-01-09	Merge branch 'jn/less-reconfigure'	blob \| diff \| raw
2013-01-09	Merge branch 'er/stop-recommending-parsecvs'	blob \| diff \| raw
2013-01-08	Merge branch 'kb/maint-bundle-doc'	blob \| diff \| raw
2013-01-08	Merge branch 'as/test-name-alias-uniquely'	blob \| diff \| raw
2013-01-08	Merge branch 'ta/remove-stale-translated-tut'	blob \| diff \| raw
2013-01-08	Merge branch 'tb/test-t9810-no-sed-i'	blob \| diff \| raw
2013-01-08	Merge branch 'tb/test-t9020-no-which'	blob \| diff \| raw
2013-01-08	Merge branch 'jk/maint-fast-import-doc-dedup-done'	blob \| diff \| raw
2013-01-08	Merge branch 'ms/subtree-fixlets' into maint	blob \| diff \| raw
2013-01-08	Merge branch 'jc/maint-fnmatch-old-style-definition...	blob \| diff \| raw
2013-01-08	Merge branch 'jc/maint-fbsd-sh-ifs-workaround' into...	blob \| diff \| raw
2013-01-08	Merge branch 'jc/mkstemp-more-careful-error-reporting...	blob \| diff \| raw
2013-01-08	Merge branch 'jc/test-cvs-no-init-in-existing-dir'...	blob \| diff \| raw
2013-01-08	Merge branch 'jc/maint-test-portability' into maint	blob \| diff \| raw
2013-01-07	Merge branch 'mz/oneway-merge-wo-u-no-lstat'	blob \| diff \| raw
2013-01-07	Merge branch 'cc/no-gitk-build-dependency'	blob \| diff \| raw
2013-01-07	Merge branch 'jn/warn-on-inaccessible-loosen'	blob \| diff \| raw
2013-01-07	Merge branch 'jc/apply-trailing-blank-removal'	blob \| diff \| raw
2013-01-06	Merge branch 'jc/format-color-auto'	blob \| diff \| raw
2013-01-06	Merge branch 'jc/fetch-ignore-symref'	blob \| diff \| raw
2013-01-06	Merge branch 'mh/unify-xml-in-imap-send-and-http-push'	blob \| diff \| raw
2013-01-06	Merge branch 'jk/fsck-dot-in-trees'	blob \| diff \| raw
2013-01-06	Merge branch 'pf/editor-ignore-sigint'	blob \| diff \| raw
2013-01-03	Merge branch 'ms/subtree-fixlets'	blob \| diff \| raw
2013-01-03	Merge branch 'as/test-tweaks'	blob \| diff \| raw
2013-01-03	Merge branch 'jc/same-encoding'	blob \| diff \| raw
2013-01-03	Merge branch 'pf/editor-ignore-sigint'	blob \| diff \| raw
2013-01-03	Merge branch 'mh/pthreads-autoconf'	blob \| diff \| raw
2013-01-03	Merge branch 'mk/qnx'	blob \| diff \| raw
2013-01-03	Merge branch 'dm/port'	blob \| diff \| raw
2013-01-03	Merge branch 'jc/maint-fnmatch-old-style-definition'	blob \| diff \| raw
2013-01-02	Merge branch 'jc/maint-fbsd-sh-ifs-workaround'	blob \| diff \| raw
2013-01-02	Merge branch 'sp/shortlog-missing-lf'	blob \| diff \| raw
2013-01-02	Merge branch 'md/gitweb-sort-by-age'	blob \| diff \| raw
2013-01-02	Merge branch 'nd/invalidate-i-t-a-cache-tree'	blob \| diff \| raw
2013-01-02	Merge branch 'jk/repack-ref-racefix'	blob \| diff \| raw
2013-01-02	Merge branch 'rb/http-cert-cred-no-username-prompt'	blob \| diff \| raw
2013-01-02	Merge branch 'mk/maint-graph-infinity-loop'	blob \| diff \| raw
2013-01-02	Merge branch 'ss/svn-prompt'	blob \| diff \| raw
2013-01-02	Merge branch 'jc/mkstemp-more-careful-error-reporting'	blob \| diff \| raw
2013-01-02	Merge branch 'jc/test-cvs-no-init-in-existing-dir'	blob \| diff \| raw
2013-01-02	Merge branch 'jc/maint-test-portability'	blob \| diff \| raw
2013-01-02	Merge branch 'mh/ceiling'	blob \| diff \| raw
2012-12-28	Merge branch 'so/prompt-command'	blob \| diff \| raw
2012-12-27	Sync with 1.8.0.3	blob \| diff \| raw
2012-12-23	Merge branch 'maint'	blob \| diff \| raw
2012-12-21	Merge branch 'jc/doc-diff-blobs'	blob \| diff \| raw
2012-12-21	Merge branch 'cr/doc-checkout-branch'	blob \| diff \| raw
2012-12-21	Merge branch 'ta/api-index-doc'	blob \| diff \| raw
2012-12-21	Merge branch 'jk/avoid-mailto-invalid-in-doc'	blob \| diff \| raw
next