git-p4: handle update of moved/copied files when updating a shelve
[git] / notes-merge.c
2018-12-15  Junio C HamanoMerge branch 'jc/run-command-report-exec-failure-fix...
2018-12-15  Junio C HamanoMerge branch 'js/help-commands-verbose-by-default-fix...
2018-12-15  Junio C HamanoMerge branch 'nd/show-gitcomp-compilation-fix' into...
2018-12-15  Junio C HamanoMerge branch 'js/mailinfo-format-flowed-fix' into maint
2018-12-15  Junio C HamanoMerge branch 'ds/hash-independent-tests-fix' into maint
2018-12-04  Junio C HamanoMerge branch 'en/rebase-consistency'
2018-12-01  Junio C HamanoMerge branch 'ss/msvc-strcasecmp'
2018-12-01  Junio C HamanoMerge branch 'rt/rebase-in-c-message-fix'
2018-12-01  Junio C HamanoMerge branch 'sg/daemon-test-signal-fix'
2018-12-01  Junio C HamanoMerge branch 'ma/reset-doc-rendering-fix'
2018-12-01  Junio C HamanoMerge branch 'ab/replace-graft-with-replace-advice'
2018-11-29  Junio C HamanoMerge branch 'nd/n18n-fix'
2018-11-26  Junio C HamanoMerge branch 'nd/per-worktree-ref-iteration'
2018-11-26  Junio C HamanoMerge branch 'tb/clone-case-smashing-warning-test'
2018-11-26  Junio C HamanoMerge branch 'jk/t5562-perl-path-fix'
2018-11-21  Junio C HamanoSync with 2.19.2
2018-11-21  Junio C HamanoMerge branch 'sg/test-rebase-editor-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'tb/char-may-be-unsigned' into maint
2018-11-21  Junio C HamanoMerge branch 'jk/uploadpack-packobjectshook-fix' into...
2018-11-21  Junio C HamanoMerge branch 'sg/doc-show-branch-typofix' into maint
2018-11-21  Junio C HamanoMerge branch 'mm/doc-no-dashed-git' into maint
2018-11-21  Junio C HamanoMerge branch 'ma/t7005-bash-workaround' into maint
2018-11-21  Junio C HamanoMerge branch 'ma/mailing-list-address-in-git-help'...
2018-11-21  Junio C HamanoMerge branch 'nd/packobjectshook-doc-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'jk/check-everything-connected-is-long...
2018-11-21  Junio C HamanoMerge branch 'fe/doc-updates' into maint
2018-11-21  Junio C HamanoMerge branch 'tq/refs-internal-comment-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'bw/protocol-v2' into maint
2018-11-21  Junio C HamanoMerge branch 'sb/string-list-remove-unused' into maint
2018-11-21  Junio C HamanoMerge branch 'jk/dev-build-format-security' into maint
2018-11-21  Junio C HamanoMerge branch 'sg/t3701-tighten-trace' into maint
2018-11-21  Junio C HamanoMerge branch 'en/double-semicolon-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'sg/doc-trace-appends' into maint
2018-11-21  Junio C HamanoMerge branch 'tg/conflict-marker-size' into maint
2018-11-21  Junio C HamanoMerge branch 'ts/doc-build-manpage-xsl-quietly' into...
2018-11-21  Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix' into...
2018-11-21  Junio C HamanoMerge branch 'jc/receive-deny-current-branch-fix' into...
2018-11-21  Junio C HamanoMerge branch 'js/diff-notice-has-drive-prefix' into...
2018-11-21  Junio C HamanoMerge branch 'jk/run-command-notdot' into maint
2018-11-21  Junio C HamanoMerge branch 'np/log-graph-octopus-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'sm/show-superproject-while-conflicted...
2018-11-21  Junio C HamanoMerge branch 'jn/mailmap-update' into maint
2018-11-21  Junio C HamanoMerge branch 'en/sequencer-empty-edit-result-aborts...
2018-11-21  Junio C HamanoMerge branch 'nd/attr-pathspec-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'en/rerere-multi-stage-1-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'js/mingw-o-append' into maint
2018-11-21  Junio C HamanoMerge branch 'jk/reopen-tempfile-truncate' into maint
2018-11-21  Junio C HamanoMerge branch 'bp/mv-submodules-with-fsmonitor' into...
2018-11-21  Junio C HamanoMerge branch 'js/rebase-i-autosquash-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'jk/trailer-fixes' into maint
2018-11-21  Junio C HamanoMerge branch 'cc/shared-index-permbits'
2018-11-21  Junio C HamanoMerge branch 'nd/clone-case-smashing-warning'
2018-11-21  Junio C HamanoMerge branch 'cc/delta-islands'
2018-11-20  Jiang XinMerge branch 'master' of git://github.com/git-l10n...
2018-11-19  Junio C HamanoMerge branch 'nd/format-patch-cover-letter-stat-width'
2018-11-19  Junio C HamanoMerge branch 'ds/push-squelch-ambig-warning'
2018-11-18  Junio C HamanoMerge branch 'jk/close-duped-fd-before-unlock-for-bundle'
2018-11-18  Junio C HamanoMerge branch 'js/fuzz-cxxflags'
2018-11-18  Junio C HamanoMerge branch 'js/mingw-msdn-url'
2018-11-18  Junio C HamanoMerge branch 'cb/notes-freeing-always-null-fix'
2018-11-18  Junio C HamanoMerge branch 'js/apply-recount-allow-noop'
2018-11-18  Junio C HamanoMerge branch 'ra/rev-parse-exclude-glob'
2018-11-18  Junio C HamanoMerge branch 'js/rebase-autostash-detach-fix'
2018-11-18  Junio C HamanoMerge branch 'ab/range-diff-no-patch'
2018-11-18  Junio C HamanoMerge branch 'jk/verify-sig-merge-into-void'
2018-11-18  Junio C HamanoMerge branch 'mg/gpg-fingerprint-test'
2018-11-18  Junio C HamanoMerge branch 'ds/reachable-topo-order'
2018-11-13  Junio C HamanoMerge branch 'nd/tree-walk-path-exclusion'
2018-11-13  Junio C HamanoMerge branch 'sg/travis-install-dependencies'
2018-11-13  Junio C HamanoMerge branch 'jk/xdiff-interface'
2018-11-13  Junio C HamanoMerge branch 'nd/per-worktree-ref-iteration'
2018-11-13  Junio C HamanoMerge branch 'ag/rebase-i-in-c'
2018-11-13  Junio C HamanoMerge branch 'al/send-email-auto-cte-fixup'
2018-11-13  Junio C HamanoMerge branch 'pw/am-rebase-read-author-script'
2018-11-13  Junio C HamanoMerge branch 'jc/war-on-string-list'
2018-11-13  Junio C HamanoMerge branch 'ag/rev-parse-all-exclude-fix'
2018-11-13  Junio C HamanoMerge branch 'ao/submodule-wo-gitmodules-checked-out'
2018-11-13  Junio C HamanoMerge branch 'ma/sequencer-do-reset-saner-loop-termination'
2018-11-13  Junio C HamanoMerge branch 'js/mingw-utf8-env'
2018-11-13  Junio C HamanoMerge branch 'ab/pack-tests-cleanup'
2018-11-13  Junio C HamanoMerge branch 'ds/test-multi-pack-index'
2018-11-13  Junio C HamanoMerge branch 'nd/wildmatch-double-asterisk'
2018-11-13  Junio C HamanoMerge branch 'jk/stream-pack-non-delta-clarification'
2018-11-13  Junio C HamanoMerge branch 'jk/proto-v2-ref-prefix-fix'
2018-11-13  Junio C HamanoMerge branch 'jk/detect-truncated-zlib-input'
2018-11-06  Junio C HamanoMerge branch 'sg/test-verbose-log'
2018-11-06  Junio C HamanoMerge branch 'ss/travis-ci-force-vm-mode'
2018-11-06  Junio C HamanoMerge branch 'sg/test-rebase-editor-fix'
2018-11-06  Junio C HamanoMerge branch 'tb/char-may-be-unsigned'
2018-11-06  Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix'
2018-11-06  Junio C HamanoMerge branch 'nd/unpack-trees-with-cache-tree'
2018-11-06  Junio C HamanoMerge branch 'nd/completion-negation'
2018-11-06  Junio C HamanoMerge branch 'jt/upload-pack-v2-fix-shallow'
2018-11-06  Junio C HamanoMerge branch 'sb/submodule-url-to-absolute'
2018-11-06  Junio C HamanoMerge branch 'js/shallow-and-fetch-prune'
2018-11-02  Junio C HamanoMerge branch 'jc/http-curlver-warnings'
2018-11-02  Junio C HamanoMerge branch 'js/mingw-http-ssl'
2018-11-02  Junio C HamanoMerge branch 'mg/gpg-fingerprint'
2018-11-02  Junio C HamanoMerge branch 'mg/gpg-parse-tighten'
2018-11-02  Junio C HamanoMerge branch 'en/merge-cleanup-more'
next