Aggressive three-way merge: fix D/F case
[gitweb.git] / builtin-apply.c
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 '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 Merge branch 'maint-1.6.4' into maint
2009-10-27 Merge git://repo.or.cz/git-gui
2009-10-26 Merge branch 'sb/gitweb-link-author'
2009-10-26 Merge branch 'jk/maint-cvsimport-pathname'
2009-10-26 Merge branch 'iv/tar-lzma-xz'
2009-10-26 Merge branch 'bg/clone-doc'
2009-10-26 Merge branch 'jc/receive-pack-auto'
2009-10-26 Sync with 1.6.5.2
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-25 Merge branch 'maint'
2009-10-24 Merge branch 'maint'
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-22 Merge branch 'maint'
2009-10-22 Merge branch 'gb/maint-gitweb-esc-param'
2009-10-20 Merge branch 'maint'
2009-10-19 Merge branch 'bg/rebase-reword'
2009-10-19 Merge branch 'jp/maint-send-email-fold'
2009-10-19 Merge branch 'cc/replace-no-replace'
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-19 Merge branch 'jn/gitweb-show-size'
2009-10-19 Merge branch 'jp/fetch-tag-match'
2009-10-19 Merge branch 'jn/gitweb-patch'
2009-10-19 Merge branch 'tf/doc-pt-br'
2009-10-19 Merge branch 'dk/blame-el'
2009-10-19 Merge branch 'mr/instaweb-cgid'
2009-10-19 Merge branch 'maint'
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-16 Merge branch 'jc/maint-checkout-index-to-prefix' 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 'pk/fast-import-dirs'
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-04 apply --whitespace: warn blank but not necessarily...
2009-09-04 apply --whitespace=warn/error: diagnose blank at EOF
2009-09-04 apply.c: split check_whitespace() into two
2009-09-04 apply --whitespace=fix: detect new blank lines at eof...
2009-09-04 apply --whitespace=fix: fix handling of blank lines...
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 builtin-apply.c: get rid of an unnecessary use of tempo...
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-29 Merge branch 'maint'
2009-08-29 Merge branch 'rc/maint-http-fix' into maint
2009-08-28 Merge branch 'maint'
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
next