diff-lib: allow ita entries treated as "not yet exist in index"
[gitweb.git] / resolve-undo.c
2016-09-26 Merge branch 'jk/clone-recursive-progress'
2016-09-26 Merge branch 'jk/doc-cvs-update'
2016-09-26 Merge branch 'rt/rebase-i-broken-insn-advise'
2016-09-26 Merge branch 'ls/travis-homebrew-path-fix'
2016-09-26 Merge branch 'tg/add-chmod+x-fix'
2016-09-26 Merge branch 'js/regexec-buf'
2016-09-26 Merge branch 'nd/checkout-disambiguation'
2016-09-26 Merge branch 'va/i18n-more'
2016-09-26 Merge branch 'jt/format-patch-rfc'
2016-09-26 Merge branch 'ep/doc-check-ref-format-example'
2016-09-26 Merge branch 'mh/diff-indent-heuristic'
2016-09-26 Merge branch 'rs/c-auto-resets-attributes'
2016-09-26 Merge branch 'mm/config-color-ui-default-to-auto'
2016-09-26 Merge branch 'rs/cocci'
2016-09-21 Merge branch 'jk/reduce-gc-aggressive-depth'
2016-09-21 Merge branch 'jk/rebase-i-drop-ident-check'
2016-09-21 Merge branch 'va/i18n'
2016-09-21 Merge branch 'jt/format-patch-base-info-above-sig'
2016-09-21 Merge branch 'ks/perf-build-with-autoconf'
2016-09-21 Merge branch 'mr/vcs-svn-printf-ulong'
2016-09-21 Merge branch 'rs/xdiff-merge-overlapping-hunks-for...
2016-09-21 Merge branch 'rs/unpack-trees-reduce-file-scope-global'
2016-09-21 Merge branch 'rs/strbuf-remove-fix'
2016-09-21 Merge branch 'rs/pack-sort-with-llist-mergesort'
2016-09-21 Merge branch 'rs/checkout-some-states-are-const'
2016-09-21 Merge branch 'jk/setup-sequence-update'
2016-09-21 Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
2016-09-21 Merge branch 'bw/pathspec-remove-unused-extern-decl'
2016-09-21 Merge branch 'ks/pack-objects-bitmap'
2016-09-21 Merge branch 'jk/patch-ids-no-merges'
2016-09-21 Merge branch 'jk/delta-base-cache'
2016-09-21 Merge branch 'et/add-chmod-x'
2016-09-21 Merge branch 'js/cat-file-filters'
2016-09-21 Merge branch 'jt/accept-capability-advertisement-when...
2016-09-19 Sync with maint
2016-09-19 Merge branch 'bc/object-id'
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07 cache: convert struct cache_entry to use struct object_id
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-08-03 Merge branch 'jk/git-jump'
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-13 Merge branch 'js/t3404-grammo-fix'
2016-07-11 Merge branch 'cb/t7810-test-label-fix' into maint
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-06-03 Merge branch 'pa/cherry-pick-doc-typo'
2016-05-26 Merge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18 Merge branch 'rn/glossary-typofix' into HEAD
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-05-10 Merge branch 'rn/glossary-typofix'
2016-05-02 Merge branch 'ad/cygwin-wants-rename' into maint
2016-04-22 Merge branch 'ad/cygwin-wants-rename'
2016-04-03 Merge branch 'jc/maint-index-pack-keep'
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-03-03 Merge branch 'jc/maint-index-pack-keep' into jc/index...
2016-02-22 Merge branch 'jk/config-include'
2016-02-05 Merge branch 'ss/clone-depth-single-doc' into maint
2016-02-05 Merge branch 'ew/for-each-ref-doc' into maint
2016-02-05 Merge branch 'ss/user-manual' into maint
2016-02-05 Merge branch 'nd/stop-setenv-work-tree' into maint
2016-01-20 Merge branch 'ss/clone-depth-single-doc'
2016-01-20 Merge branch 'ew/for-each-ref-doc'
2016-01-20 Merge branch 'ss/user-manual'
2016-01-20 Merge branch 'jk/pack-revindex'
2016-01-12 Merge branch 'nd/stop-setenv-work-tree'
2015-12-22 Merge branch 'nd/stop-setenv-work-tree' into nd/clear...
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-12-01 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05 Merge branch 'jc/add-u-A-default-to-top' into maint
2015-11-04 Merge branch 'xf/user-manual-ff' into maint
2015-11-04 Merge branch 'xf/user-manual-markup' into maint
2015-11-03 Merge branch 'jk/merge-file-exit-code' into maint
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30 Merge branch 'jk/merge-file-exit-code'
2015-10-30 Merge branch 'xf/user-manual-ff'
2015-10-30 Merge branch 'jc/add-u-A-default-to-top'
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-29 Merge branch 'xf/user-manual-markup'
2015-10-20 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-16 Merge branch 'sb/http-flaky-test-fix' into maint
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-16 Merge branch 'jw/make-arflags-customizable' into maint
2015-10-15 Merge branch 'sb/http-flaky-test-fix'
2015-10-14 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-05 Merge branch 'jw/make-arflags-customizable'
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-17 Merge branch 'as/config-doc-markup-fix'
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into...
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
next