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