traverse_trees(): handle D/F conflict case sanely
[gitweb.git] / builtin-commit.c
2009-11-16 Merge branch 'tr/maint-roff-quote' into maint
2009-11-15 Merge branch 'maint'
2009-11-11 Merge branch 'maint'
2009-11-10 Merge branch 'maint'
2009-11-10 Merge branch 'jk/maint-format-patch-p-suppress-stat'
2009-11-10 Merge branch 'pb/maint-gitweb-blob-lineno'
2009-11-10 Merge branch 'tr/describe-advice'
2009-11-10 Merge branch 'jk/maint-1.6.3-ls-files-i'
2009-11-10 Merge branch 'bg/merge-ff-only'
2009-11-10 Merge branch 'vl/maint-openssl-signature-change'
2009-11-10 Merge branch 'jk/maint-push-config'
2009-11-10 Merge branch 'jk/gitignore-anchored'
2009-11-10 Merge branch 'jp/dirty-describe'
2009-11-10 Merge branch 'sr/blame-incomplete'
2009-11-10 Merge branch 'jn/maint-http-fetch-mingw' into jn/help...
2009-11-09 Merge branch 'maint'
2009-11-07 Merge branch 'jc/commit-s-subject-is-not-a-footer'
2009-11-07 builtin-commit.c: fix logic to omit empty line before...
2009-11-05 commit -c/-C/--amend: reset timestamp and authorship...
2009-11-05 Merge branch 'maint'
2009-11-02 Merge branch 'jn/show-normalized-refs'
2009-11-02 Merge branch 'maint'
2009-10-31 fixup tr/stash-format merge
2009-10-31 Merge branch 'js/diff-verbose-submodule'
2009-10-31 Merge branch 'jc/checkout-auto-track'
2009-10-31 Merge branch 'jn/show-normalized-refs'
2009-10-31 Merge branch 'jc/maint-1.6.3-graft-trailing-space'
2009-10-31 Merge branch 'ak/bisect-reset-to-switch'
2009-10-31 Merge branch 'tr/maint-roff-quote'
2009-10-31 Merge branch 'ja/fetch-doc'
2009-10-31 Merge branch 'cb/doc-fetch-pull-merge'
2009-10-31 Merge branch 'maint'
2009-10-28 Merge branch 'maint'
2009-10-28 commit: More generous accepting of RFC-2822 footer...
2009-10-28 Merge branch 'maint-1.6.4' into maint
2009-10-27 Merge git://repo.or.cz/git-gui
2009-10-25 Merge branch 'maint-1.6.4' into maint
2009-10-25 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
2009-10-25 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'jp/maint-send-email-fold' into maint
2009-10-24 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'pv/maint-add-p-no-exclude' into maint
2009-10-20 Refactor pretty_print_commit arguments into a struct
2009-10-19 Merge branch 'jp/maint-send-email-fold'
2009-10-19 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
2009-10-19 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
2009-10-17 Merge branch 'jc/maint-blank-at-eof'
2009-10-17 Merge branch 'maint-1.6.4' into maint
2009-10-14 Merge branch 'pv/maint-add-p-no-exclude'
2009-10-13 Merge branch 'maint-1.6.4' into maint
2009-10-09 Merge branch 'rs/maint-archive-prefix'
2009-10-09 Merge branch 'maint'
2009-10-08 Merge branch 'maint'
2009-10-04 Merge branch 'maint'
2009-10-04 Merge branch 'jc/maint-1.6.4-show-branch-default' into...
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-20 Merge branch 'maint'
2009-09-16 Merge 1.6.4.4 in
2009-09-16 Merge branch 'jc/maint-unpack-objects-strict' into...
2009-09-16 Merge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-16 Merge branch 'jk/maint-1.6.3-checkout-unborn' into...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-14 Merge branch 'maint'
2009-09-13 Merge branch 'db/vcs-helper'
2009-09-13 Merge branch 'maint'
2009-09-13 Merge branch 'cb/maint-1.6.3-grep-relative-up' into...
2009-09-07 Merge branch 'maint'
2009-09-07 Merge branch 'jc/mailinfo-scissors'
2009-09-07 Merge branch 'jk/clone-b'
2009-09-07 Merge branch 'jc/upload-pack-hook'
2009-09-07 Merge branch 'tr/reset-checkout-patch'
2009-09-07 Merge branch 'np/maint-1.6.3-deepen'
2009-09-06 Merge branch 'maint'
2009-09-03 Merge branch 'maint'
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-03 Merge branch 'maint'
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-01 Merge branch 'lt/approxidate'
2009-09-01 Merge branch 'mr/gitweb-snapshot'
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29 Sync with 1.6.4.2
2009-08-29 Merge branch 'mm/reset-report'
2009-08-29 Merge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-29 Merge branch 'np/maint-1.6.3-deepen'
2009-08-29 Merge branch 'jc/shortstatus'
2009-08-28 Merge branch 'maint-1.6.3' into maint
2009-08-28 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-28 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-27 Merge branch 'jc/maint-unpack-objects-strict'
2009-08-26 Merge branch 'maint-1.6.3' into maint
2009-08-26 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
2009-08-25 Merge branch 'aj/fix-read-tree-from-scratch'
2009-08-22 Merge branch 'cc/replace'
next