Merge branch 'master' into next
[git] / ll-merge.c
2009-08-12  Junio C HamanoMerge branch 'jc/shortstatus' (early part) into next
2009-08-12  Junio C HamanoMerge branch 'lt/block-sha1' into next
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 'bc/maint-am-email' into next
2009-08-11  Junio C HamanoMerge branch 'js/maint-cover-letter-non-ascii' into...
2009-08-11  Junio C HamanoMerge branch 'jc/verify-pack-stat' into next
2009-08-11  Junio C HamanoMerge branch 'jc/maint-clean-nested-dir-safety' into...
2009-08-11  Junio C HamanoMerge branch 'lt/block-sha1' into next
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-09  Junio C HamanoMerge branch 'js/run-command-updates' into next
2009-08-09  Junio C HamanoMerge branch 'jk/maint-merge-msg-fix' into next
2009-08-09  Junio C HamanoMerge branch 'jp/symlink-dirs' into next
2009-08-09  Junio C HamanoMerge branch 'master' into next
2009-08-08  Junio C HamanoMerge branch 'master' into next
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-07  Junio C HamanoMerge branch 'db/vcs-helper' (early part) into next
2009-08-07  Junio C HamanoMerge branch 'jk/push-quiet' into next
2009-08-07  Junio C HamanoMerge branch 'np/maint-limit-delta-cache' into next
2009-08-07  Junio C HamanoMerge branch 'gb/apply-ignore-whitespace' into next
2009-08-07  Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix' into next
2009-08-07  Junio C HamanoMerge branch 'bc/mailsplit-cr-at-eol' into next
2009-08-07  Junio C HamanoMerge branch 'jc/shortstatus' (early part) into next
2009-08-07  Junio C HamanoMerge branch 'zf/maint-gitweb-acname' into next
2009-08-07  Junio C HamanoMerge branch 'ns/am-raw-email' into next
2009-08-07  Junio C HamanoMerge branch 'db/vcs-helper' (early part) into next
2009-08-07  Junio C HamanoMerge branch 'lt/block-sha1' into next
2009-08-07  Junio C HamanoMerge branch 'jn/gitweb-blame' (early part) into next
2009-08-07  Junio C HamanoMerge branch 'master' into next
2009-08-06  Junio C HamanoMerge branch 'db/vcs-helper' (early part) into next
2009-08-06  Junio C HamanoMerge branch 'lt/block-sha1' into next
2009-08-05  Junio C HamanoMerge branch 'jn/gitweb-blame' into next
2009-08-05  Junio C HamanoMerge branch 'jp/symlink-dirs' into next
2009-08-05  Junio C HamanoMerge branch 'js/run-command-updates' into next
2009-08-05  Junio C HamanoMerge branch 'master' into next
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-08-03  Junio C HamanoMerge branch 'jc/1.7.0-diff-whitespace-only-status...
2009-08-03  Junio C HamanoMerge branch 'jc/1.7.0-push-safety' into jch
2009-08-03  Junio C HamanoMerge branch 'cc/replace' into jch
2009-08-03  Junio C HamanoMerge branch 'mk/grep-max-depth' into jch
2009-08-03  Junio C HamanoMerge branch 'sb/read-tree' into jch
2009-08-03  Junio C HamanoMerge branch 'jc/apply-epoch-patch' into jch
2009-08-03  Junio C HamanoMerge branch 'sb/parse-options' into jch
2009-08-03  Junio C HamanoMerge branch 'ns/init-mkdir' into jch
2009-08-03  Junio C HamanoMerge branch 'mk/init-db-parse-options' into jch
2009-08-03  Junio C HamanoMerge branch 'js/run-command-updates' into jch
2009-08-03  Junio C HamanoMerge branch 'ne/futz-upload-pack' into jch
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
next