merge: refuse --commit with --squash
[gitweb.git] / t / t3504-cherry-pick-rerere.sh
2017-09-25 Merge branch 'cc/subprocess-handshake-missing-capabilities'
2017-09-25 Merge branch 'kw/write-index-reduce-alloc'
2017-09-22 Sync with 2.13.6
2017-09-20 Merge branch 'jk/describe-omit-some-refs' into mk/descr...
2017-09-20 Merge branch 'jk/info-alternates-fix-2.11' into jk...
2017-09-19 Merge branch 'rk/commit-tree-make-F-verbatim'
2017-09-19 Merge branch 'jk/shortlog-ident-cleanup'
2017-09-19 Merge branch 'kw/merge-recursive-cleanup'
2017-09-19 Merge branch 'mh/packed-ref-store-prep'
2017-09-19 Merge branch 'jk/system-path-cleanup'
2017-09-19 Merge branch 'bb/doc-eol-dirty'
2017-09-19 Merge branch 'ma/split-symref-update-fix'
2017-09-19 Merge branch 'mh/notes-cleanup'
2017-09-19 Merge branch 'mg/timestamp-t-fix'
2017-09-19 Merge branch 'ma/pkt-line-leakfix'
2017-09-19 Merge branch 'jk/config-lockfile-leak-fix'
2017-09-19 Merge branch 'dw/diff-highlight-makefile-fix'
2017-09-19 Merge branch 'ti/external-sha1dc'
2017-09-10 Merge branch 'rs/apply-epoch'
2017-09-10 Merge branch 'jk/drop-sha1-entry-pos'
2017-09-10 Merge branch 'nd/worktree-kill-parse-ref'
2017-09-10 Merge branch 'mm/send-email-cc-cruft'
2017-09-10 Merge branch 'ma/up-to-date'
2017-09-10 Merge branch 'ma/ts-cleanups'
2017-09-10 Merge branch 'jt/doc-pack-objects-fix' into maint
2017-09-10 Merge branch 'jn/vcs-svn-cleanup' into maint
2017-09-10 Merge branch 'bc/vcs-svn-cleanup' into maint
2017-09-10 Merge branch 'jk/doc-the-this' into maint
2017-09-10 Merge branch 'rs/commit-h-single-parent-cleanup' into...
2017-09-10 Merge branch 'mg/format-ref-doc-fix' into maint
2017-09-10 Merge branch 'sb/submodule-parallel-update' into maint
2017-09-10 Merge branch 'hv/t5526-andand-chain-fix' into maint
2017-09-10 Merge branch 'sb/sha1-file-cleanup' into maint
2017-09-10 Merge branch 'rs/t1002-do-not-use-sum' into maint
2017-09-10 Merge branch 'ah/doc-empty-string-is-false' into maint
2017-09-10 Merge branch 'rs/merge-microcleanup' into maint
2017-09-10 Merge branch 'rs/find-pack-entry-bisection' into maint
2017-09-10 Merge branch 'rs/apply-lose-prefix-length' into maint
2017-09-10 Merge branch 'rj/add-chmod-error-message' into maint
2017-09-10 Merge branch 'jk/hashcmp-memcmp' into maint
2017-09-10 Merge branch 'rs/t3700-clean-leftover' into maint
2017-09-10 Merge branch 'jc/perl-git-comment-typofix' into maint
2017-09-10 Merge branch 'mf/no-dashed-subcommands' into maint
2017-09-10 Merge branch 'ab/ref-filter-no-contains' into maint
2017-09-10 Merge branch 'rs/archive-excluded-directory' into maint
2017-09-10 Merge branch 'mg/killed-merge' into maint
2017-09-10 Merge branch 'tb/apply-with-crlf' into maint
2017-09-10 Merge branch 'cc/subprocess-handshake-missing-capabilit...
2017-09-10 Merge branch 'as/grep-quiet-no-match-exit-code-fix...
2017-09-10 Merge branch 'kd/stash-with-bash-4.4' into maint
2017-09-10 Merge branch 'rs/win32-syslog-leakfix' into maint
2017-09-10 Merge branch 'rs/unpack-entry-leakfix' into maint
2017-09-10 Merge branch 'rs/fsck-obj-leakfix' into maint
2017-09-10 Merge branch 'ur/svn-local-zone' into maint
2017-09-10 Merge branch 'pw/am-signoff' into maint
2017-09-10 Merge branch 'rs/in-obsd-basename-dirname-take-const...
2017-09-10 Merge branch 'rs/t4062-obsd' into maint
2017-09-10 Merge branch 'rs/obsd-getcwd-workaround' into maint
2017-09-10 Merge branch 'bw/clone-recursive-quiet' into maint
2017-09-10 Merge branch 'pw/sequence-rerere-autoupdate' into maint
2017-09-06 Merge branch 'rs/archive-excluded-directory'
2017-09-06 Merge branch 'po/read-graft-line'
2017-09-06 Merge branch 'ks/branch-set-upstream'
2017-08-27 Merge branch 'mg/killed-merge'
2017-08-27 Merge branch 'mh/ref-lock-entry'
2017-08-27 Merge branch 'jt/doc-pack-objects-fix'
2017-08-27 Merge branch 'jc/cutoff-config'
2017-08-27 Merge branch 'kw/write-index-reduce-alloc'
2017-08-27 Merge branch 'bw/submodule-config-cleanup'
2017-08-27 Merge branch 'js/gitweb-raw-blob-link-in-history'
2017-08-27 Merge branch 'po/object-id'
2017-08-27 Merge branch 'jn/vcs-svn-cleanup'
2017-08-27 Merge branch 'bc/vcs-svn-cleanup'
2017-08-27 Merge branch 'tb/apply-with-crlf'
2017-08-27 Merge branch 'jt/stash-tests'
2017-08-27 Merge branch 'jk/trailers-parse'
2017-08-27 Merge branch 'pb/trailers-from-command-line'
2017-08-27 Merge branch 'jt/diff-color-move-fix'
2017-08-27 Merge branch 'sb/diff-color-move'
2017-08-24 Merge branch 'jk/doc-the-this'
2017-08-24 Merge branch 'rs/commit-h-single-parent-cleanup'
2017-08-24 Merge branch 'jc/simplify-progress'
2017-08-24 Merge branch 'tc/curl-with-backports'
2017-08-24 Merge branch 'cc/subprocess-handshake-missing-capabilities'
2017-08-24 Merge branch 'rs/object-id'
2017-08-24 Merge branch 'lg/merge-signoff'
2017-08-23 Sync with maint
2017-08-23 Merge branch 'mg/format-ref-doc-fix'
2017-08-23 Merge branch 'sb/submodule-parallel-update'
2017-08-23 Merge branch 'jc/diff-sane-truncate-no-more'
2017-08-23 Merge branch 'hv/t5526-andand-chain-fix'
2017-08-23 Merge branch 'as/grep-quiet-no-match-exit-code-fix'
2017-08-23 Merge branch 'kw/commit-keep-index-when-pre-commit...
2017-08-23 Merge branch 'sb/sha1-file-cleanup'
2017-08-23 Merge branch 'rs/t1002-do-not-use-sum'
2017-08-23 Merge branch 'kd/stash-with-bash-4.4'
2017-08-23 Merge branch 'ah/doc-empty-string-is-false'
2017-08-23 Merge branch 'kw/rebase-progress'
2017-08-23 Merge branch 'ks/prepare-commit-msg-sample-fix'
2017-08-23 Merge branch 'nm/stash-untracked'
next