fast-import: Introduce --import-marks-if-exists
[gitweb.git] / combine-diff.c
2011-01-13 Merge branch 'jk/diff-driver-binary-doc'
2011-01-13 Merge branch 'tr/submodule-relative-scp-url'
2011-01-10 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-12-26 Merge branch 'rs/maint-diff-fd-leak' into maint
2010-12-16 Merge branch 'jn/maint-fast-import-object-reuse'
2010-12-15 Git 1.7.1.4 v1.7.1.4
2010-12-15 Git 1.7.0.9 v1.7.0.9
2010-12-15 Git 1.6.6.3 v1.6.6.3
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-12-14 Merge branch 'mz/maint-rebase-stat-config' into maint
2010-12-13 Merge branch 'mz/maint-rebase-stat-config'
2010-12-09 Merge branch 'np/diff-in-corrupt-repository' into maint
2010-12-09 Merge branch 'cm/diff-check-at-eol' into maint
2010-12-02 Git 1.7.1.3 v1.7.1.3
2010-12-02 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-12-01 Merge branch 'js/maint-apply-tab-in-indent-fix' into...
2010-11-30 Merge branch 'np/diff-in-corrupt-repository'
2010-11-30 Merge branch 'cm/diff-check-at-eol'
2010-11-24 Merge branch 'aw/git-p4-deletion' into maint
2010-11-05 Merge branch 'aw/git-p4-deletion'
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-10-27 Merge branch 'en/tree-walk-optim'
2010-09-29 Merge branch 'rr/format-patch-count-without-merges'
2010-09-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-08 Merge branch 'bc/maint-fetch-url-only'
2010-09-08 Merge branch 'en/d-f-conflict-fix'
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' into maint
2010-08-31 Merge branch 'en/d-f-conflict-fix'
2010-08-22 Merge branch 'nd/fix-sparse-checkout'
2010-08-22 Merge branch 'en/rebase-against-rebase-fix'
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-19 Merge branch 'jc/sha1-name-find-fix' into maint
2010-08-18 Merge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-13 Merge branch 'jc/sha1-name-find-fix'
2010-08-13 Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-03 Merge branch 'sv/maint-diff-q-clear-fix' into maint
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-07-27 Sync with 1.7.0 series
2010-07-26 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-07-26 Merge branch 'maint-1.6.6' into maint-1.7.0
2010-07-26 Merge branch 'maint-1.6.5' into maint-1.6.6
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jn/grep-open'
2010-07-09 Merge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07 Merge branch 'maint-1.6.4' into maint
2010-07-07 Merge branch 'tr/receive-pack-aliased-update-fix' into...
2010-06-30 Merge branch 'cc/cherry-pick-stdin'
2010-06-30 Merge branch 'jl/status-ignore-submodules'
2010-06-30 Merge branch 'jk/url-decode'
2010-06-30 Merge branch 'jn/grep-open'
2010-06-30 Merge branch 'jp/string-list-api-cleanup'
2010-06-30 Merge branch 'tr/rev-list-count'
2010-06-30 Merge branch 'as/maint-completion-set-u-fix'
2010-06-30 Merge branch 'jl/maint-diff-ignore-submodules'
2010-06-28 Merge branch 'tr/send-email-8bit' into maint
2010-06-28 Merge branch 'pb/maint-perl-errmsg-no-dir' into maint
2010-06-28 Merge branch 'js/maint-am-rebase-invalid-author' into...
2010-06-28 Merge branch 'jc/maint-simpler-common-prefix' into...
2010-06-28 Merge branch 'bd/maint-unpack-trees-parawalk-fix' into...
2010-06-27 Merge branch 'cp/textconv-cat-file'
2010-06-27 Merge branch 'pb/maint-perl-errmsg-no-dir'
2010-06-27 Merge branch 'tr/send-email-8bit'
2010-06-27 Merge branch 'js/maint-am-rebase-invalid-author'
2010-06-27 Merge branch 'ab/blame-textconv'
2010-06-27 Merge branch 'jn/show-num-walks'
2010-06-23 Merge branch 'jk/url-decode'
2010-06-22 Merge branch 'jc/maint-simpler-common-prefix'
2010-06-22 Merge branch 'bd/maint-unpack-trees-parawalk-fix'
2010-06-22 Merge branch 'cc/cherry-pick-series'
2010-06-22 Merge branch 'jc/rev-list-ancestry-path'
2010-06-22 Merge branch 'ic/maint-rebase-i-abort' into maint
2010-06-22 Merge branch 'cc/maint-commit-reflog-msg' into maint
2010-06-22 Merge branch 'jk/maint-advice-empty-amend' into maint
2010-06-22 Merge branch 'tc/commit-abbrev-fix' into maint
2010-06-22 Merge branch 'jn/document-rebase-i-p-limitation' into...
2010-06-22 Merge branch 'jn/checkout-doc' into maint
2010-06-22 Merge branch 'cc/maint-diff-CC-binary' into maint
2010-06-22 Merge branch 'jc/t9129-any-utf8' into maint
2010-06-22 Merge branch 'cb/ls-files-cdup' into maint
2010-06-22 Merge branch 'tc/merge-m-log' into maint
2010-06-22 Merge branch 'ph/clone-message-reword' into maint
2010-06-22 Merge branch 'jn/maint-amend-missing-name' into maint
2010-06-22 Merge branch 'pc/remove-warn' into maint
2010-06-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-06-21 Merge branch 'cc/maint-commit-reflog-msg'
2010-06-21 Merge branch 'ic/maint-rebase-i-abort'
2010-06-21 Merge branch 'jk/maint-advice-empty-amend'
2010-06-21 Merge branch 'eb/core-eol'
2010-06-21 Merge branch 'fg/autocrlf'
2010-06-21 Merge branch 'sm/branch-broken-ref'
2010-06-21 Merge branch 'rr/parse-date-refactor'
2010-06-21 Merge branch 'jn/document-rebase-i-p-limitation'
2010-06-21 Merge branch 'tc/commit-abbrev-fix'
2010-06-21 Merge branch 'tr/receive-pack-aliased-update-fix'
2010-06-21 Merge branch 'gs/usage-to-stdout'
next