Andrew's git - gitweb.git/history

[gitweb.git] / ll-merge.c

2009-08-11	Merge branch 'jc/maint-merge-recursive-fix'	blob \| diff \| raw
2009-08-11	Merge branch 'zf/maint-gitweb-acname'	blob \| diff \| raw
2009-08-11	Merge branch 'ns/am-raw-email'	blob \| diff \| raw
2009-08-11	Merge branch 'np/maint-limit-delta-cache'	blob \| diff \| raw
2009-08-11	Merge branch 'jp/symlink-dirs'	blob \| diff \| raw
2009-08-11	Merge branch 'mk/grep-max-depth'	blob \| diff \| raw
2009-08-11	Merge branch 'js/run-command-updates'	blob \| diff \| raw
2009-08-08	Merge branch 'maint-1.6.3' into maint	blob \| diff \| raw \| diff to current
2009-08-08	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| diff \| raw \| diff to current
2009-08-08	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| diff \| raw \| diff to current
2009-08-05	Merge branch 'sb/read-tree'	blob \| diff \| raw \| diff to current
2009-08-05	Merge branch 'ne/futz-upload-pack'	blob \| diff \| raw \| diff to current
2009-08-05	Merge branch 'maint-1.6.3' into maint	blob \| diff \| raw \| diff to current
2009-07-29	Merge branch 'hv/cvsps-tests'	blob \| diff \| raw \| diff to current
2009-07-29	Sync with 1.6.3.4	blob \| diff \| raw \| diff to current
2009-07-26	Merge branch 'gp/maint-rebase-p-onto'	blob \| diff \| raw \| diff to current
2009-07-26	Merge branch 'en/fast-export'	blob \| diff \| raw \| diff to current
2009-07-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-07-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-07-25	Merge branch 'js/maint-graft-unhide-true-parents'	blob \| diff \| raw \| diff to current
2009-07-25	Merge branch 'av/maint-config-reader'	blob \| diff \| raw \| diff to current
2009-07-25	Merge branch 'jk/maint-send-email-alias-loop'	blob \| diff \| raw \| diff to current
2009-07-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-07-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-07-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-07-11	Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'	blob \| diff \| raw \| diff to current
2009-07-09	Merge branch 'ld/push-porcelain-output-format'	blob \| diff \| raw \| diff to current
2009-07-09	Merge branch 'gb/gitweb-avatar'	blob \| diff \| raw \| diff to current
2009-07-09	Merge branch 'ml/http'	blob \| diff \| raw \| diff to current
2009-07-09	Merge branch 'rs/grep-p'	blob \| diff \| raw \| diff to current
2009-07-09	Merge branch 'js/run-command-updates' (early part)	blob \| diff \| raw \| diff to current
2009-07-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-07-08	Merge branch 'cb/maint-fetch-refspec-wo-dst' into maint	blob \| diff \| raw \| diff to current
2009-07-06	Merge branch 'tr/die_errno'	blob \| diff \| raw \| diff to current
2009-07-06	Merge branch 'cb/maint-fetch-refspec-wo-dst'	blob \| diff \| raw \| diff to current
2009-07-06	Merge branch 'sb/show-ref-parse-options'	blob \| diff \| raw \| diff to current
2009-07-06	Merge branch 'gb/am-foreign'	blob \| diff \| raw \| diff to current
2009-07-06	Merge branch 'jk/use-our-regexp'	blob \| diff \| raw \| diff to current
2009-07-06	Merge branch 'uk/rev-parse-parse-opt'	blob \| diff \| raw \| diff to current
2009-07-05	run_command: return exit code as positive value	blob \| diff \| raw \| diff to current
2009-07-02	Remove filename from conflict markers	blob \| diff \| raw \| diff to current
2009-07-02	Merge branch 'cc/bisect'	blob \| diff \| raw \| diff to current
2009-07-02	Merge branch 'js/daemon-log'	blob \| diff \| raw \| diff to current
2009-07-02	Merge branch 'cf/maint-remote-uploadpack-useconfig...	blob \| diff \| raw \| diff to current
2009-07-02	Merge branch 'sb/quiet-porcelains'	blob \| diff \| raw \| diff to current
2009-07-02	Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'	blob \| diff \| raw \| diff to current
2009-07-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-06-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-06-27	Merge branch 'pb/send-email-cccmd-fix'	blob \| diff \| raw \| diff to current
2009-06-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-06-27	Use die_errno() instead of die() when checking syscalls	blob \| diff \| raw \| diff to current
2009-06-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-06-22	Merge branch 'sb/maint-1.6.0-add-config-fix' into maint	blob \| diff \| raw \| diff to current
2009-06-22	Sync with 1.6.3.3	blob \| diff \| raw \| diff to current
2009-06-22	Merge branch 'ak/maint-for-each-ref-no-lookup' into...	blob \| diff \| raw \| diff to current
2009-06-22	Merge branch 'rc/maint-http-local-slot-fix' into maint	blob \| diff \| raw \| diff to current
2009-06-22	Merge branch 'cb/maint-no-double-merge' into maint	blob \| diff \| raw \| diff to current
2009-06-22	Merge branch 'mn/maint-iconv-autoconf' into maint	blob \| diff \| raw \| diff to current
2009-06-22	Merge branch 'lt/maint-unsigned-left-shift' into maint	blob \| diff \| raw \| diff to current
2009-06-22	Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'maint-1.6.2' into maint	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'ph/submodule-rebase'	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'jc/cache-tree'	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'mg/pushurl'	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'mn/maint-iconv-autoconf'	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'sb/pull-rebase'	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'pb/send-email-cccmd-fix'	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'pb/maint-1.6.2-userdiff-fix'	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'sb/maint-1.6.0-add-config-fix'	blob \| diff \| raw \| diff to current
2009-06-21	Merge branch 'lt/maint-unsigned-left-shift'	blob \| diff \| raw \| diff to current
2009-06-20	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2009-06-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-06-18	Merge branch 'sb/parse-options-integer'	blob \| diff \| raw \| diff to current
2009-06-18	Merge branch 'ak/maint-for-each-ref-no-lookup'	blob \| diff \| raw \| diff to current
2009-06-14	use xstrdup, not strdup in ll-merge.c	blob \| diff \| raw \| diff to current
2009-06-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-06-14	Merge branch 'maint-1.6.2' into maint	blob \| diff \| raw \| diff to current
2009-06-14	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'rc/http-push'	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'cc/bisect' (early part)	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'rc/maint-http-local-slot-fix'	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'sp/msysgit'	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'cb/maint-no-double-merge'	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'ph/submodule-rebase' (early part)	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'bc/solaris'	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'cb/match_refs_internal_tail'	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'nw/maint-cvsexportcommit'	blob \| diff \| raw \| diff to current
2009-06-13	Merge branch 'da/araxis-mergetool'	blob \| diff \| raw \| diff to current
2009-06-12	Merge branch 'mh/maint-fix-send-email-threaded' into...	blob \| diff \| raw \| diff to current
2009-06-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-06-11	Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...	blob \| diff \| raw \| diff to current
2009-06-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-06-09	Simplify some instances of run_command() by using run_c...	blob \| diff \| raw \| diff to current
2009-06-06	Merge branch 'rc/maint-http-local-slot-fix' into rc...	blob \| diff \| raw \| diff to current
2009-06-02	Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint	blob \| diff \| raw \| diff to current
2009-06-02	Merge branch 'rs/maint-grep-word-regexp-fix' into maint	blob \| diff \| raw \| diff to current
2009-06-02	Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...	blob \| diff \| raw \| diff to current
next