rerere: mention caveat about unmatched conflict markers
[gitweb.git] / t / t4254-am-corrupt.sh
2018-06-28 Merge branch 'sb/fix-fetching-moved-submodules'
2018-06-28 Merge branch 'tz/cred-netrc-cleanup'
2018-06-28 Merge branch 'jc/clean-after-sanity-tests'
2018-06-28 Merge branch 'nd/completion-negation'
2018-06-28 Merge branch 'pw/add-p-recount'
2018-06-28 Merge branch 'jk/fetch-all-peeled-fix'
2018-06-28 Merge branch 'ms/send-pack-honor-config'
2018-06-28 Merge branch 'jh/partial-clone'
2018-06-28 Merge branch 'sg/gpg-tests-fix'
2018-06-28 Merge branch 'as/safecrlf-quiet-fix'
2018-06-28 Merge branch 'ab/refspec-init-fix'
2018-06-25 Merge branch 'sb/plug-misc-leaks'
2018-06-25 Merge branch 'cc/tests-without-assuming-ref-files-backend'
2018-06-25 Merge branch 'sg/update-ref-stdin-cleanup'
2018-06-25 Merge branch 'nd/reject-empty-shallow-request'
2018-06-25 Merge branch 'ls/complete-remote-update-names'
2018-06-25 Merge branch 'ag/rebase-p'
2018-06-25 Merge branch 'nd/complete-config-vars'
2018-05-30 Merge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-29 am: move advice.amWorkDir parsing back to advice.c
2018-05-08 Merge branch 'ab/git-svn-get-record-typofix'
2018-04-25 Merge branch 'js/t5404-path-fix'
2018-04-25 Merge branch 'mn/send-email-credential-doc'
2018-04-25 Merge branch 'ak/bisect-doc-typofix'
2018-03-22 Merge branch 'sb/status-doc-fix' into maint
2018-03-22 Merge branch 'cl/t9001-cleanup' into maint
2018-03-22 Merge branch 'nd/diff-flush-before-warning' into maint
2018-03-21 Merge branch 'dp/merge-strategy-doc-fix'
2018-03-08 Merge branch 'mk/doc-pretty-fill'
2018-03-06 Merge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02 Merge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02 Merge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-02-28 Merge branch 'tz/do-not-clean-spec-file'
2018-02-28 Merge branch 'sb/status-doc-fix'
2018-02-27 Merge branch 'bp/name-hash-dirname-fix'
2018-02-15 Merge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-13 Merge branch 'nd/diff-flush-before-warning'
2018-02-13 Merge branch 'cl/t9001-cleanup'
2018-01-23 Merge branch 'as/read-tree-prefix-doc-fix'
2018-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui
2017-12-28 Merge branch 'sr/http-sslverify-config-doc'
2017-12-27 Merge branch 'es/clone-shared-worktree'
2017-12-27 Merge branch 'jk/cvsimport-quoting'
2017-12-27 Merge branch 'rs/am-builtin-leakfix'
2017-12-05 Merge branch 'ls/no-double-utf8-author-name' of .....
2017-11-22 Merge branch 'jn/reproducible-build' of ../git-gui...
2017-11-09 Merge branch 'tz/fsf-address-update' of ../git-gui...
2017-11-06 Merge branch 'ex/deprecate-empty-pathspec-as-match...
2017-10-28 Merge branch 'sg/rev-list-doc-reorder-fix'
2017-10-23 Merge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-19 Merge branch 'jc/fetch-refspec-doc-update'
2017-10-18 Merge branch 'ma/pkt-line-leakfix' into maint
2017-10-18 Merge branch 'jc/merge-x-theirs-docfix' into maint
2017-10-18 Merge branch 'rs/mailinfo-qp-decode-fix' into maint
2017-10-18 Merge branch 'aw/gc-lockfile-fscanf-fix' into maint
2017-09-28 Merge branch 'jc/merge-x-theirs-docfix'
2017-09-28 Merge branch 'rs/mailinfo-qp-decode-fix'
2017-09-25 Merge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-22 Sync with 2.10.5
2017-09-19 Merge branch 'ma/pkt-line-leakfix'
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 'sb/sha1-file-cleanup' into maint
2017-09-10 Merge branch 'rs/t1002-do-not-use-sum' into maint
2017-09-10 Merge branch 'rs/find-pack-entry-bisection' into maint
2017-09-10 Merge branch 'rj/add-chmod-error-message' into maint
2017-09-10 Merge branch 'jc/perl-git-comment-typofix' into maint
2017-09-10 Merge branch 'rs/t4062-obsd' into maint
2017-08-27 Merge branch 'jt/doc-pack-objects-fix'
2017-08-27 Merge branch 'jn/vcs-svn-cleanup'
2017-08-27 Merge branch 'bc/vcs-svn-cleanup'
2017-08-23 Merge branch 'js/run-process-parallel-api-fix' into...
2017-08-23 Merge branch 'sb/sha1-file-cleanup'
2017-08-23 Merge branch 'rs/t1002-do-not-use-sum'
2017-08-22 Merge branch 'rs/t4062-obsd'
2017-08-22 Merge branch 'rs/find-pack-entry-bisection'
2017-08-22 Merge branch 'rj/add-chmod-error-message'
2017-08-22 Merge branch 'jc/perl-git-comment-typofix'
2017-08-11 Merge branch 'js/run-process-parallel-api-fix'
2017-08-04 Merge branch 'ah/patch-id-doc'
2017-07-31 Merge branch 'rs/apply-avoid-over-reading' into maint
2017-07-30 Merge tag 'v2.10.4' into maint-2.11
2017-07-25 Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-07-21 Merge branch 'ew/fd-cloexec-fix' into maint
2017-07-21 Merge branch 'ks/fix-rebase-doc-picture' into maint
2017-07-20 Merge branch 'ew/fd-cloexec-fix'
2017-07-12 Merge branch 'ks/fix-rebase-doc-picture'
2017-07-12 Merge branch 'rs/apply-avoid-over-reading'
2017-07-10 Merge branch 'jc/utf8-fprintf' into maint
2017-07-10 Merge branch 'js/fsck-name-object' into maint
2017-07-10 Merge branch 'mb/reword-autocomplete-message' into...
2017-07-10 Merge branch 'ks/t7508-indent-fix' into maint
2017-07-10 Merge branch 'sb/t4005-modernize' into maint
2017-07-10 Merge branch 'jc/pack-bitmap-unaligned' into maint
2017-07-10 Merge branch 'rs/pretty-add-again' into maint
2017-07-07 Merge branch 'rs/apply-avoid-over-reading'
2017-07-07 Merge branch 'jc/utf8-fprintf'
2017-07-07 Merge branch 'js/fsck-name-object'
2017-06-30 Merge branch 'jc/pack-bitmap-unaligned'
next