apply: --3way with add/add conflict
[gitweb.git] / diff.h
2012-05-07 Merge branch 'nh/empty-rebase'
2012-05-07 Merge branch 'zj/diff-empty-chmod'
2012-05-07 Merge branch 'jk/maint-tformat-with-z'
2012-05-07 Merge branch 'th/difftool-diffall'
2012-05-07 Sync with maint
2012-05-07 Merge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-07 Merge branch 'js/daemon-test-race-fix' into maint
2012-05-07 Merge branch 'jk/maint-config-bogus-section' into maint
2012-05-07 Merge branch 'pw/t5800-import-race-fix' into maint
2012-05-07 Merge branch 'rt/cherry-revert-conflict-summary' into...
2012-05-07 Merge branch 'cb/maint-report-mount-point-correctly...
2012-05-03 Merge branch 'maint'
2012-05-03 Merge branch 'jc/merge-reduce-parents-early' into maint
2012-05-03 Merge branch 'cb/cherry-pick-rev-path-confusion' into...
2012-05-03 Merge branch 'cb/http-multi-curl-auth' into maint
2012-05-03 Merge branch 'mb/fetch-call-a-non-branch-a-ref' into...
2012-05-03 Merge branch 'rl/maint-stash-i18n-save-error' into...
2012-05-03 Merge branch 'jm/maint-strncpy-diff-no-index' into...
2012-05-03 Merge branch 'jk/maint-push-progress'
2012-05-03 Merge branch 'nd/columns'
2012-05-02 Merge branch 'master' of git://git.bogomips.org/git-svn
2012-05-02 Merge branch 'tr/xdiff-fast-hash'
2012-05-02 Merge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-05-02 Merge branch 'pw/message-cleanup'
2012-05-02 Merge branch 'zj/diff-stat-smaller-num-columns'
2012-05-02 Merge branch 'pw/p4-various'
2012-05-02 Merge branch 'jc/rerere-train'
2012-05-02 Merge branch 'ab/i18n'
2012-05-02 Merge branch 'lp/diffstat-with-graph'
2012-05-02 Merge branch 'zj/mksh-columns-breakage'
2012-05-02 Merge branch 'jk/doc-asciidoc-inline-literal'
2012-05-02 Merge branch 'jc/index-v4'
2012-05-02 Sync with v1.7.10.1
2012-05-02 Merge branch 'pw/fast-import-dataref-parsing' into...
2012-05-02 Merge branch 'it/fetch-pack-many-refs' into maint
2012-05-02 Merge branch 'jl/maint-submodule-recurse-fetch' into...
2012-05-02 Merge branch 'jc/maint-blame-minimal' into maint
2012-05-02 Merge branch 'lp/maint-diff-three-dash-with-graph'...
2012-05-02 Merge branch 'jk/rebase-i-submodule-conflict-only'...
2012-05-01 Merge l10n updates from branch 'maint' into master
2012-04-30 Merge branch 'ld/git-p4-tags-and-labels'
2012-04-30 Merge branch 'nh/empty-rebase'
2012-04-30 Merge branch 'jk/maint-config-bogus-section'
2012-04-30 Merge branch 'js/daemon-test-race-fix'
2012-04-30 Merge branch 'kk/gitweb-omit-expensive'
2012-04-30 Merge branch 'kk/maint-gitweb-missing-owner'
2012-04-30 Merge branch 'mm/include-userpath'
2012-04-30 Merge branch 'pw/t5800-import-race-fix'
2012-04-30 Merge branch 'jk/repack-no-explode-objects-from-old...
2012-04-28 Merge branch 'maint'
2012-04-28 Merge maint branch for tracking l10n updates of git...
2012-04-28 Merge master branch for tracking l10n updates of next...
2012-04-27 Merge branch 'jc/merge-reduce-parents-early'
2012-04-27 Merge branch 'js/fast-import-test-9300'
2012-04-27 Merge branch 'rt/cherry-revert-conflict-summary'
2012-04-27 Merge branch 'cb/maint-report-mount-point-correctly...
2012-04-27 Merge branch 'cb/cherry-pick-rev-path-confusion'
2012-04-27 Merge branch 'cb/http-multi-curl-auth'
2012-04-27 Merge branch 'zj/mksh-columns-breakage' into lp/diffsta...
2012-04-26 Merge branch 'rl/maint-stash-i18n-save-error'
2012-04-26 Merge branch 'mb/fetch-call-a-non-branch-a-ref'
2012-04-26 Merge branch 'jm/maint-strncpy-diff-no-index'
2012-04-26 Merge bundle error message fix in
2012-04-26 Merge branch 'jk/run-command-eacces' into maint
2012-04-26 Merge branch 'jc/push-upstream-sanity' into maint
2012-04-26 Merge branch 'jc/maint-clean-nested-worktree-in-subdir...
2012-04-26 Merge branch 'jk/diff-no-rename-empty' into maint
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26 Merge branch 'jc/commit-unedited-template' into maint
2012-04-26 Merge branch 'jk/add-p-skip-conflicts' into maint
2012-04-26 Merge branch 'jc/commit-hook-authorship' into maint
2012-04-26 Merge branch 'tr/maint-word-diff-regex-sticky' into...
2012-04-26 Merge branch 'jh/notes-merge-in-git-dir-worktree' into...
2012-04-26 Sync with 1.7.9.7
2012-04-26 Sync with 1.7.8.6
2012-04-26 Sync with 1.7.7.7
2012-04-24 Merge branch 'fc/completion-tests'
2012-04-24 Merge branch 'cc/fix-missing-va-end-in-revert'
2012-04-24 Merge branch 'zj/upstream-error-message'
2012-04-24 Merge branch 'mk/gitweb-diff-hl'
2012-04-24 Merge branch 'it/fetch-pack-many-refs'
2012-04-24 Merge branch 'pw/fast-import-dataref-parsing'
2012-04-24 Merge branch 'mh/ref-api'
2012-04-24 Merge branch 'hv/submodule-recurse-push'
2012-04-23 Merge branch 'bw/test-fix-grep-gnuism'
2012-04-23 Merge branch 'rj/submodule-mswin-path'
2012-04-23 Merge branch 'rj/sh-setup-mswin-pwd'
2012-04-23 Merge branch 'rj/mingw-isguid'
2012-04-23 Merge branch 'jn/fast-import-doc'
2012-04-23 Merge branch 'jn/more-i18ncmp'
2012-04-23 Merge branch 'jl/maint-submodule-recurse-fetch'
2012-04-23 Merge branch 'jc/maint-blame-minimal'
2012-04-23 Merge branch 'lp/maint-diff-three-dash-with-graph'
2012-04-23 Merge branch 'rs/commit-list-sort-in-batch'
2012-04-23 Merge branch 'jh/apply-free-patch'
2012-04-23 Merge branch 'sl/test-wc-l-line-count'
2012-04-23 Merge branch 'jn/debian-customizes-default-editor'
2012-04-23 Merge branch 'rl/show-empty-prefix'
2012-04-23 Merge branch 'pw/git-p4'
2012-04-23 Merge branch 'ms/remote-usage-string'
next