merge-octopus: abort if index does not match HEAD
[gitweb.git] / t / t3700-add.sh
2016-04-08 Merge branch 'oa/doc-diff-check'
2016-04-08 Merge branch 'pb/opt-cmdmode-doc'
2016-04-08 Merge branch 'nd/apply-doc'
2016-04-08 Merge branch 'jc/merge-refuse-new-root'
2016-04-06 Merge branch 'jv/merge-nothing-into-void'
2016-04-06 Merge branch 'ss/commit-squash-msg'
2016-04-06 Merge branch 'jk/test-httpd-config-nosystem'
2016-04-06 Merge branch 'jk/send-email-rtrim-mailrc-alias'
2016-04-06 Merge branch 'jk/credential-cache-comment-exit'
2016-04-06 Merge branch 'sb/clone-t57-t56'
2016-04-06 Merge branch 'ls/p4-map-user'
2016-04-06 Merge branch 'pb/t7502-drop-dup'
2016-04-06 Merge branch 'da/mergetool-delete-delete-conflict'
2016-04-06 Merge branch 'sb/submodule-parallel-update'
2016-04-06 Merge branch 'ss/exc-flag-is-a-collection-of-bits'
2016-04-03 Merge branch 'jk/getwholeline-getdelim-empty'
2016-04-03 Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'
2016-04-03 Merge branch 'jc/maint-index-pack-keep'
2016-04-03 Merge branch 'jk/rev-parse-local-env-vars'
2016-04-03 Merge branch 'jk/config-get-urlmatch'
2016-04-03 Merge branch 'mp/upload-pack-use-embedded-args'
2016-03-24 Merge branch 'ls/p4-doc-markup'
2016-03-24 Merge branch 'sb/submodule-module-list-pathspec-fix'
2016-03-21 Sync with maint
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-17 Sync with Git 2.7.4
2016-03-16 Sync with maint
2016-03-16 Merge branch 'jc/sane-grep'
2016-03-16 Merge branch 'cn/deprecate-ssh-git-url'
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-03-10 Sync with 2.7.3
2016-03-10 Merge branch 'jx/http-no-proxy'
2016-03-10 Merge branch 'js/close-packs-before-gc'
2016-03-10 Merge branch 'sb/rebase-summary'
2016-03-04 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-03-04 Merge branch 'js/pthread-exit-emu-windows'
2016-03-04 Merge branch 'sb/submodule-parallel-fetch'
2016-03-04 Merge branch 'jk/tighten-alloc'
2016-03-04 Merge branch 'jk/pack-idx-corruption-safety'
2016-03-04 Merge branch 'js/mingw-tests'
2016-03-03 Merge branch 'jc/maint-index-pack-keep' into jc/index...
2016-02-26 Merge branch 'ma/update-hooks-sample-typofix'
2016-02-26 Merge branch 'dt/initial-ref-xn-commit-doc'
2016-02-26 Merge branch 'js/config-set-in-non-repository'
2016-02-26 Merge branch 'jk/epipe-in-async'
2016-02-26 Merge branch 'fa/merge-recursive-no-rename'
2016-02-26 Merge branch 'sb/submodule-fetch-nontip'
2016-02-26 Merge branch 'sb/submodule-module-list-fix'
2016-02-26 Merge branch 'jk/grep-binary-workaround-in-test'
2016-02-26 Merge branch 'ps/plug-xdl-merge-leak'
2016-02-26 Merge branch 'mm/push-simple-doc'
2016-02-26 Merge branch 'jg/credential-cache-chdir-to-sockdir'
2016-02-26 Merge branch 'ps/config-error'
2016-02-26 Merge branch 'mg/work-tree-tests'
2016-02-26 Merge branch 'ls/config-origin'
2016-02-26 Merge branch 'jk/tighten-alloc'
2016-02-26 Merge branch 'jk/more-comments-on-textconv'
2016-02-26 Merge branch 'jk/no-diff-emit-common'
2016-02-26 Merge branch 'ak/git-strip-extension-from-dashed-command'
2016-02-26 Merge branch 'ak/extract-argv0-last-dir-sep'
2016-02-26 Merge branch 'kn/ref-filter-atom-parsing'
2016-02-24 Merge branch 'jc/am-i-v-fix'
2016-02-24 Merge branch 'ce/https-public-key-pinning'
2016-02-24 Merge branch 'bc/http-empty-auth'
2016-02-24 Merge branch 'sp/remote-curl-ssl-strerror'
2016-02-24 Merge branch 'ew/force-ipv4'
2016-02-24 Merge branch 'nd/git-common-dir-fix'
2016-02-24 Merge branch 'nd/dwim-wildcards-as-pathspecs'
2016-02-22 Sync with 2.7.2
2016-02-22 Merge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22 Merge branch 'jk/config-include'
2016-02-22 Merge branch 'ew/connect-verbose'
2016-02-22 Merge branch 'pw/completion-stash'
2016-02-17 Merge branch 'maint'
2016-02-17 Merge branch 'dw/mergetool-vim-window-shuffle'
2016-02-17 Merge branch 'ah/stripspace-optstring'
2016-02-17 Merge branch 'mm/clean-doc-fix'
2016-02-17 Merge branch 'jk/rerere-xsnprintf'
2016-02-17 Merge branch 'da/user-useconfigonly'
2016-02-17 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-02-17 Merge branch 'mg/mingw-test-fix'
2016-02-17 Merge branch 'js/mingw-tests'
2016-02-17 Merge branch 'jk/drop-rsync-transport'
2016-02-10 Merge branch 'js/test-lib-windows-emulated-yes'
2016-02-10 Merge branch 'wp/sha1-name-negative-match'
2016-02-10 Merge branch 'jk/options-cleanup'
2016-02-10 Merge branch 'aw/push-force-with-lease-reporting'
2016-02-10 Merge branch 'ls/clean-smudge-override-in-config'
2016-02-10 Merge branch 'ew/connect-verbose'
2016-02-10 Merge branch 'cc/untracked'
2016-02-10 Merge branch 'js/xmerge-marker-eol'
2016-02-10 Merge branch 'nd/do-not-move-worktree-manually'
2016-02-05 Sync with 2.7.1
2016-02-05 Merge branch 'ss/clone-depth-single-doc' into maint
2016-02-05 Merge branch 'sg/t6050-failing-editor-test-fix' into...
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 'jk/sanity' into maint
2016-02-05 Merge branch 'nd/stop-setenv-work-tree' into maint
2016-02-03 Merge branch 'kf/http-proxy-auth-methods'
next