merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / t / t1503-rev-parse-verify.sh
2016-10-26 Merge branch 'jk/tap-verbose-fix'
2016-10-26 Merge branch 'mm/send-email-cc-cruft-after-address'
2016-10-26 Merge branch 'yk/git-tag-remove-mention-of-old-layout...
2016-10-26 Merge branch 'jk/diff-submodule-diff-inline'
2016-10-26 Merge branch 'tg/add-chmod+x-fix'
2016-10-26 Merge branch 'bw/submodule-branch-dot-doc'
2016-10-26 Merge branch 'pb/test-parse-options-expect'
2016-10-26 Merge branch 'jk/tighten-alloc'
2016-10-26 Merge branch 'va/i18n'
2016-10-26 Merge branch 'jk/fetch-quick-tag-following'
2016-10-26 Merge branch 'jk/merge-base-fork-point-without-reflog'
2016-10-26 Merge branch 'jk/ambiguous-short-object-names'
2016-10-26 Merge branch 'jk/upload-pack-use-prio-queue'
2016-10-26 Merge branch 'ab/gitweb-abbrev-links'
2016-10-26 Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok'
2016-10-26 Merge branch 'mg/gpg-richer-status'
2016-10-26 Merge branch 'jc/cocci-xstrdup-or-null'
2016-10-26 Merge branch 'mm/credential-libsecret'
2016-10-26 Merge branch 'bw/ls-files-recurse-submodules'
2016-10-26 Merge branch 'js/libify-require-clean-work-tree'
2016-10-26 Merge branch 'jc/ws-error-highlight'
2016-10-26 Merge branch 'jc/diff-unique-abbrev-comments'
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-10-17 Sync with maint
2016-10-17 Merge branch 'sb/submodule-config-doc-drop-path'
2016-10-17 Merge branch 'rs/pretty-format-color-doc-fix'
2016-10-17 Merge branch 'js/reset-usage'
2016-10-17 Merge branch 'da/mergetool-diff-order'
2016-10-17 Merge branch 'rs/cocci'
2016-10-17 Merge branch 'js/regexec-buf'
2016-10-17 Merge branch 'jk/ref-symlink-loop'
2016-10-11 Merge branch 'jc/verify-loose-object-header' into maint
2016-10-10 files_read_raw_ref: avoid infinite loop on broken symlinks
2016-10-03 Merge branch 'jc/verify-loose-object-header'
2016-09-29 Merge branch 'jk/reduce-gc-aggressive-depth' into maint
2016-09-29 Merge branch 'mr/vcs-svn-printf-ulong' into maint
2016-09-26 Merge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26 Merge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-21 Merge branch 'jk/reduce-gc-aggressive-depth'
2016-09-21 Merge branch 'mr/vcs-svn-printf-ulong'
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 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-08-10 Merge branch 'js/commit-slab-decl-fix'
2016-08-10 Merge branch 'jc/grep-commandline-vs-configuration...
2016-08-10 Merge branch 'os/no-verify-skips-commit-msg-too' into...
2016-08-10 Merge branch 'ew/autoconf-pthread' into maint
2016-08-08 Merge branch 'nd/log-decorate-color-head-arrow'
2016-08-08 Merge branch 'sb/pack-protocol-doc-nak' into maint
2016-08-08 Merge branch 'jc/doc-diff-filter-exclude' into maint
2016-08-08 Merge branch 'lf/recv-sideband-cleanup' into maint
2016-08-08 Merge branch 'js/ignore-space-at-eol' into maint
2016-08-08 Merge branch 'jk/push-scrub-url' into maint
2016-08-04 Merge branch 'jc/grep-commandline-vs-configuration'
2016-08-04 Merge branch 'sb/pack-protocol-doc-nak'
2016-08-03 Merge branch 'jk/git-jump'
2016-08-03 Merge branch 'os/no-verify-skips-commit-msg-too'
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-28 Merge branch 'ew/gc-auto-pack-limit-fix' into maint
2016-07-28 Merge branch 'js/color-on-windows-comment' into maint
2016-07-28 Merge branch 'nd/ita-cleanup' into maint
2016-07-28 Merge branch 'js/find-commit-subject-ignore-leading...
2016-07-25 Merge branch 'ew/autoconf-pthread'
2016-07-25 Merge branch 'jk/push-scrub-url'
2016-07-25 Merge branch 'jc/doc-diff-filter-exclude'
2016-07-25 Merge branch 'js/ignore-space-at-eol'
2016-07-19 Merge branch 'lf/recv-sideband-cleanup'
2016-07-13 Merge branch 'nd/ita-cleanup'
2016-07-13 Merge branch 'js/t3404-grammo-fix'
2016-07-13 Merge branch 'ew/gc-auto-pack-limit-fix'
2016-07-11 Merge branch 'cb/t7810-test-label-fix' into maint
2016-07-11 Merge branch 'ao/p4-has-branch-prefix-fix' into maint
2016-07-11 Merge branch 'ak/t7800-wo-readlink' into maint
2016-07-11 Merge branch 'lc/shell-default-value-noexpand' into...
2016-07-11 Merge branch 'jk/bisect-show-tree' into maint
2016-07-11 Merge branch 'js/color-on-windows-comment'
2016-07-11 Merge branch 'js/find-commit-subject-ignore-leading...
2016-07-11 Merge branch 'jk/ansi-color'
2016-07-06 Merge branch 'ao/p4-has-branch-prefix-fix'
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-07-06 Merge branch 'ak/t7800-wo-readlink'
2016-07-06 Merge branch 'lc/shell-default-value-noexpand'
2016-07-06 Merge branch 'jk/bisect-show-tree'
2016-07-06 Merge branch 'jc/deref-tag' into maint
2016-07-06 Merge branch 'pb/strbuf-read-file-doc' into maint
2016-07-06 Merge branch 'jk/fetch-prune-doc' into maint
2016-07-06 Merge branch 'mg/cherry-pick-multi-on-unborn' into...
2016-07-06 Merge branch 'em/newer-freebsd-shells-are-fine-with...
2016-07-06 Merge branch 'nb/gnome-keyring-build' into maint
2016-07-06 Merge branch 'jk/avoid-unbounded-alloca' into maint
2016-07-06 Merge branch 'vs/prompt-avoid-unset-variable' into...
2016-07-06 Merge branch 'dn/gpg-doc' into maint
2016-07-06 Merge branch 'ap/git-svn-propset-doc' into maint
2016-06-27 Merge branch 'mg/cherry-pick-multi-on-unborn'
2016-06-27 Merge branch 'em/newer-freebsd-shells-are-fine-with...
2016-06-27 Merge branch 'nb/gnome-keyring-build'
2016-06-27 Merge branch 'jc/deref-tag'
2016-06-27 Merge branch 'jk/avoid-unbounded-alloca'
2016-06-27 Merge branch 'vs/prompt-avoid-unset-variable'
next