rebase--merge: fix --skip with two conflicts in a row
[gitweb.git] / t / t4034 /
2014-05-28 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
2014-05-28 Merge branch 'mw/symlinks' into maint
2014-05-08 Merge branch 'cl/p4-use-diff-tree' into maint
2014-05-08 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
2014-05-08 Merge branch 'km/avoid-bs-in-shell-glob' into maint
2014-05-08 Merge branch 'km/avoid-cp-a' into maint
2014-04-09 Merge branch 'cn/fetch-prune-overlapping-destination...
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge branch 'jc/fix-diff-no-index-diff-opt-parse'...
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'mm/status-porcelain-format-i18n-fix'...
2014-04-03 Merge branch 'jk/mv-submodules-fix' into maint
2014-04-03 Merge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03 Merge branch 'jk/lib-terminal-lazy' into maint
2014-04-03 Merge branch 'nd/index-pack-error-message' into maint
2014-04-03 Merge branch 'rr/doc-merge-strategies' into maint
2014-04-03 Merge branch 'jc/stash-pop-not-popped' into maint
2014-03-18 Merge branch 'jk/clean-d-pathspec' into maint
2014-03-18 Merge branch 'da/difftool-git-files' into maint
2014-03-18 Merge branch 'jk/remote-pushremote-config-reading'...
2014-03-18 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18 Merge branch 'tr/diff-submodule-no-reuse-worktree'...
2014-03-18 Merge branch 'nd/reset-setup-worktree' into maint
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Merge branch 'bk/refresh-missing-ok-in-merge-recursive...
2014-03-18 Merge branch 'ds/rev-parse-required-args' into maint
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-03-18 Merge branch 'nd/diff-quiet-stat-dirty' into maint
2014-03-18 Merge branch 'nd/http-fetch-shallow-fix' into maint
2014-03-18 Merge branch 'nd/submodule-pathspec-ending-with-slash...
2014-02-13 Sync with 1.8.5.5
2014-02-11 Merge git://github.com/git-l10n/git-po
2014-02-07 Merge branch 'ow/manpages-typofix'
2014-02-07 Merge branch 'aj/ada-diff-word-pattern'
2014-02-05 userdiff: update Ada patterns
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-17 Merge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
2013-12-05 Merge branch 'jk/two-way-merge-corner-case-fix'
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
2013-11-04 Merge branch 'vd/doc-unpack-objects'
2013-10-30 Merge branch 'jk/refs-c-squelch-gcc'
2013-10-30 Merge branch 'jk/date-c-double-semicolon'
2013-10-30 Merge branch 'sg/t3600-nul-sha1-fix'
2013-10-28 Merge branch 'ew/keepalive'
2013-10-14 Merge branch 'rj/highlight-test-hang'
2013-10-14 Merge branch 'nv/doc-config-signingkey'
2013-08-05 Merge branch 'dn/test-reject-utf-16'
2013-07-22 Merge branch 'jk/t0008-sigpipe-fix'
2013-07-22 Merge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19 Merge branch 'jc/t1512-fix' into maint
2013-07-15 Merge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-12 Merge branch 'rs/pickaxe-simplify'
2013-07-11 Merge branch 'jc/t1512-fix'
2013-07-11 Merge branch 'jc/maint-diff-core-safecrlf'
2013-06-26 Merge branch 'tr/maint-apply-non-git-patch-parsefix'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-29 Merge branch 'as/check-ignore'
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint
2013-04-26 Merge branch 'ph/rebase-original'
2013-04-24 Merge branch 'sr/log-SG-no-textconv' into maint
2013-04-19 Merge branch 'tr/copy-revisions-from-stdin'
2013-04-12 Merge branch 'sr/log-SG-no-textconv'
2013-04-04 Merge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04 Merge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04 Merge branch 'jk/peel-ref' into maint
2013-04-03 Merge branch 'lf/setup-prefix-pathspec' into maint
2013-04-03 Merge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03 Merge branch 'jk/fully-peeled-packed-ref' into maint...
2013-04-03 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03 Merge branch 'jc/perl-cat-blob' into maint-1.8.1
2013-04-03 Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-03 Merge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-04-02 Merge branch 'sw/safe-create-leading-dir-race'
2013-04-01 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-01 Merge branch 'rr/tests-dedup-test-config' into maint
2013-04-01 Merge branch 'nd/index-pack-threaded-fixes'
2013-04-01 Merge branch 'jk/index-pack-correct-depth-fix'
2013-04-01 Merge branch 'jc/remove-export-from-config-mak-in'
2013-03-28 Merge branch 'rr/tests-dedup-test-config'
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28 Merge branch 'jk/checkout-attribute-lookup'
2013-03-26 Merge branch 'jc/reflog-reverse-walk'
2013-03-26 Merge branch 'jk/utf-8-can-be-spelled-differently'...
2013-03-26 Merge branch 'jc/perl-cat-blob' into maint
2013-03-26 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-03-26 Merge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-03-25 Merge branch 'jk/fully-peeled-packed-ref'
2013-03-25 Merge branch 'jk/peel-ref'
2013-03-25 Merge branch 'lf/setup-prefix-pathspec'
2013-03-25 Merge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-25 Merge branch 'lf/bundle-verify-list-prereqs' into maint...
2013-03-25 Merge branch 'tk/doc-filter-branch' into maint-1.8.1
2013-03-25 Merge branch 'dm/ni-maxhost-may-be-missing' into maint...
2013-03-25 Merge branch 'jc/color-diff-doc' into maint-1.8.1
next