sequencer: do not update/refresh index if the lock cannot be held
[git/git.git] / merge.c
2014-03-18 Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint
2014-03-14 Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree'
2014-02-27 Junio C HamanoMerge branch 'bs/stdio-undef-before-redef'
2014-02-27 Junio C HamanoMerge branch 'jk/config-path-include-fix'
2014-02-13 Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2014-01-27 Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2014-01-23 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21 Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-17 Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-09 Junio C HamanoMerge git://repo.or.cz/git-gui
2013-12-09 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-12-05 Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix'
2013-11-07 Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
2013-11-07 Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2013-11-04 Junio C HamanoMerge branch 'vd/doc-unpack-objects'
2013-10-30 Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc'
2013-10-30 Junio C HamanoMerge branch 'jk/date-c-double-semicolon'
2013-10-30 Junio C HamanoMerge branch 'sg/t3600-nul-sha1-fix'
2013-10-28 Junio C HamanoMerge branch 'ew/keepalive'
2013-10-28 Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2013-10-14 Jonathan NiederMerge branch 'rj/highlight-test-hang'
2013-10-14 Jonathan NiederMerge branch 'nv/doc-config-signingkey'
2013-09-26 Jonathan NiederMerge branch 'js/xread-in-full' into maint
2013-09-12 Junio C HamanoMerge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-11 Junio C HamanoMerge branch 'js/xread-in-full'
2013-08-05 Junio C HamanoMerge branch 'dn/test-reject-utf-16'
2013-07-31 Junio C HamanoMerge branch 'jk/commit-how-to-abort-cherry-pick'
2013-07-31 Junio C HamanoMerge branch 'ds/doc-two-kinds-of-tags'
2013-07-30 Junio C HamanoMerge branch 'jk/capabilities-doc'
2013-07-22 Junio C HamanoMerge branch 'jk/t0008-sigpipe-fix'
2013-07-22 Junio C HamanoMerge branch 'sb/parse-object-buffer-eaten'
2013-07-22 Junio C HamanoMerge branch 'rr/maint-fetch-tag-doc-asterisks' into...
2013-07-22 Junio C HamanoMerge branch 'mh/maint-lockfile-overflow' into maint
2013-07-22 Junio C HamanoMerge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19 Junio C HamanoMerge branch 'jc/t1512-fix' into maint
2013-07-15 Junio C HamanoMerge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-12 Junio C HamanoMerge branch 'rs/pickaxe-simplify'
2013-07-11 Junio C HamanoMerge branch 'jc/t1512-fix'
2013-07-11 Junio C HamanoMerge branch 'jc/maint-diff-core-safecrlf'
2013-07-11 Junio C HamanoMerge branch 'mh/maint-lockfile-overflow'
2013-07-03 Junio C HamanoMerge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03 Junio C HamanoMerge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-06-27 Junio C HamanoMerge branch 'mk/combine-diff-context-horizon-fix'...
2013-06-26 Junio C HamanoMerge branch 'tr/maint-apply-non-git-patch-parsefix'
2013-06-17 Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-06-11 Junio C HamanoMerge branch 'rr/maint-fetch-tag-doc-asterisks'
2013-06-11 Junio C HamanoMerge branch 'cr/git-work-tree-sans-git-dir'
2013-06-11 Junio C HamanoMerge branch 'fc/do-not-use-the-index-in-add-to-index'
2013-06-02 Junio C HamanoMerge branch 'mk/combine-diff-context-horizon-fix'
2013-05-29 Junio C HamanoMerge branch 'jk/lookup-object-prefer-latest'
2013-05-29 Junio C HamanoMerge branch 'as/check-ignore'
2013-05-17 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-09 Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin' into maint
2013-05-01 Junio C HamanoMerge branch 'hb/git-pm-tempfile'
2013-04-26 Junio C HamanoMerge branch 'ph/rebase-original'
2013-04-24 Junio C HamanoMerge branch 'sr/log-SG-no-textconv' into maint
2013-04-24 Junio C HamanoMerge branch 'jc/merge-tag-object' into maint
2013-04-22 Junio C HamanoMerge branch 'jc/detached-head-doc' into maint
2013-04-22 Junio C HamanoMerge branch 'jk/show-branch-strbuf' into maint
2013-04-22 Junio C HamanoMerge branch 'js/rerere-forget-protect-against-NUL...
2013-04-22 Junio C HamanoMerge branch 'jc/apply-ws-fix-tab-in-indent' into maint
2013-04-22 Junio C HamanoMerge branch 'jk/filter-branch-come-back-to-original...
2013-04-19 Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin'
2013-04-18 Junio C HamanoMerge branch 'jc/detached-head-doc'
2013-04-15 Junio C HamanoMerge branch 'jk/show-branch-strbuf'
2013-04-12 Junio C HamanoMerge branch 'jk/diffcore-break-divzero' into maint
2013-04-12 Junio C HamanoMerge branch 'cn/commit-amend-doc' into maint
2013-04-12 Junio C HamanoMerge branch 'jk/bisect-prn-unsigned' into maint
2013-04-12 Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint
2013-04-12 Junio C HamanoMerge branch 'sr/log-SG-no-textconv'
2013-04-12 Junio C HamanoMerge branch 'js/rerere-forget-protect-against-NUL'
2013-04-07 Junio C HamanoMerge branch 'cn/commit-amend-doc'
2013-04-07 Junio C HamanoMerge branch 'jk/diffcore-break-divzero'
2013-04-07 Junio C HamanoMerge branch 'jk/bisect-prn-unsigned'
2013-04-07 Junio C HamanoMerge branch 'jk/filter-branch-come-back-to-original'
2013-04-05 Junio C HamanoMerge branch 'jc/merge-tag-object'
2013-04-04 Junio C HamanoMerge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04 Junio C HamanoMerge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04 Junio C HamanoMerge branch 'jk/peel-ref' into maint
2013-04-03 Junio C HamanoMerge branch 'jc/apply-ws-fix-tab-in-indent'
2013-04-03 Junio C HamanoMerge branch 'ks/rfc2047-one-char-at-a-time' into maint
2013-04-03 Junio C HamanoMerge branch 'lf/setup-prefix-pathspec' into maint
2013-04-03 Junio C HamanoMerge branch 'kb/name-hash' into maint-1.8.1
2013-04-03 Junio C HamanoMerge branch 'kk/revwalk-slop-too-many-commit-within...
2013-04-03 Junio C HamanoMerge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03 Junio C HamanoMerge branch 'jk/fully-peeled-packed-ref' into maint...
2013-04-03 Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03 Junio C HamanoMerge branch 'jc/perl-cat-blob' into maint-1.8.1
2013-04-03 Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-03 Junio C HamanoMerge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-04-02 Junio C HamanoMerge branch 'sw/safe-create-leading-dir-race'
2013-04-01 Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-01 Junio C HamanoMerge branch 'rr/tests-dedup-test-config' into maint
2013-04-01 Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint
2013-04-01 Junio C HamanoMerge branch 'nd/index-pack-threaded-fixes'
2013-04-01 Junio C HamanoMerge branch 'jk/index-pack-correct-depth-fix'
2013-04-01 Junio C HamanoMerge branch 'jc/remove-export-from-config-mak-in'
next