Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.h

2018-05-30	Merge branch 'ma/lockfile-cleanup'	blob \| diff \| raw
2018-05-30	Merge branch 'sg/t6500-no-redirect-of-stdin'	blob \| diff \| raw
2018-05-30	Merge branch 'bp/merge-rename-config'	blob \| diff \| raw
2018-05-30	Merge branch 'js/sequencer-and-root-commits'	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'dd/send-email-reedit'	blob \| diff \| raw \| diff to current
2018-05-29	Sync with Git 2.17.1	blob \| diff \| raw \| diff to current
2018-05-29	Merge branch 'nd/command-list' into nd/complete-config...	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'fg/completion-external'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'bc/asciidoctor-tab-width'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'nd/pack-unreachable-objects-doc'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'nd/completion-aliasfiletype-typofix'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'em/status-rename-config'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'cc/perf-bisect'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'ah/misc-doc-updates'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'bp/test-drop-caches'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'en/unpack-trees-split-index-fix'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'nd/doc-header'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'bc/format-patch-cover-no-attach'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'tb/test-apfs-utf8-normalization'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'js/rebase-recreate-merge'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'nd/pack-objects-pack-struct'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'en/rename-directory-detection-reboot'	blob \| diff \| raw \| diff to current
2018-05-22	Sync with Git 2.14.4	blob \| diff \| raw \| diff to current
2018-05-22	Merge branch 'jk/submodule-name-verify-fix' into jk...	blob \| diff \| raw \| diff to current
2018-05-08	merge: add merge.renames config setting	blob \| diff \| raw
2018-05-08	merge-recursive: fix was_tracked() to quit lying with...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: fix overwriting dirty files involved...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: add computation of collisions due...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: add get_directory_renames()	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'ab/git-svn-get-record-typofix'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'sg/doc-gc-quote-mismatch-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'bp/fsmonitor-bufsize-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'es/fread-reads-dir-autoconf-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'js/t5404-path-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'mn/send-email-credential-doc'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'ak/bisect-doc-typofix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'bw/commit-partial-from-subdirectory-fix'	blob \| diff \| raw \| diff to current
2018-04-11	Revert "Merge branch 'en/rename-directory-detection'"	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'eb/cred-helper-ignore-sigpipe'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'lv/tls-1.3'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'pk/test-avoid-pipe-hiding-exit-status'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'rs/status-with-removed-submodule'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'nd/combined-test-helper'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'sb/packfiles-in-repository'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'sb/object-store'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'jc/test-must-be-empty'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'cc/perf-aggregate-sort'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'ab/doc-hash-brokenness'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'bc/hash-independent-tests'	blob \| diff \| raw \| diff to current
2018-04-11	Merge branch 'ab/drop-contrib-examples'	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'yk/filter-branch-non-committish-refs'	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'nd/trace-with-env'	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'nd/parseopt-completion-more'	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'ds/bsearch-hash'	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'ws/rebase-p'	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'jk/diff-highlight-graph-fix'	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'nd/remove-ignore-env-field'	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'ps/contains-id-error-message'	blob \| diff \| raw \| diff to current
2018-04-09	Merge branch 'tg/stash-untracked-with-pathspec-fix'	blob \| diff \| raw \| diff to current
2018-04-09	Merge branch 'nd/worktree-prune'	blob \| diff \| raw \| diff to current
2018-04-09	Merge branch 'bc/object-id'	blob \| diff \| raw \| diff to current
2018-04-09	Merge branch 'ma/shortlog-revparse'	blob \| diff \| raw \| diff to current
2018-04-09	Merge branch 'ab/install-symlinks'	blob \| diff \| raw \| diff to current
2018-04-09	Merge branch 'ml/filter-branch-no-op-error'	blob \| diff \| raw \| diff to current
2018-04-09	Merge branch 'ab/pcre-v2'	blob \| diff \| raw \| diff to current
2018-04-09	Merge branch 'ti/fetch-everything-local-optim'	blob \| diff \| raw \| diff to current
2018-04-09	Merge branch 'en/rename-directory-detection'	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'sm/mv-dry-run-update' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'gs/test-unset-xdg-cache-home' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'sb/status-doc-fix' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'bp/fsmonitor' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'bc/doc-interpret-trailers-grammofix'...	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'sg/doc-test-must-fail-args' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'nd/ignore-glob-doc-update' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'tz/doc-show-defaults-to-head' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'jc/mailinfo-cleanup-fix' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'rb/hashmap-h-compilation-fix' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'cl/t9001-cleanup' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'jt/fsck-code-cleanup' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'nd/diff-flush-before-warning' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'sg/travis-build-during-script-phase'...	blob \| diff \| raw \| diff to current
2018-03-21	Merge branch 'dp/merge-strategy-doc-fix'	blob \| diff \| raw \| diff to current
2018-03-21	Merge branch 'ks/t3200-typofix'	blob \| diff \| raw \| diff to current
2018-03-08	Merge branch 'mk/doc-pretty-fill'	blob \| diff \| raw \| diff to current
2018-03-08	Merge branch 'ds/mark-parents-uninteresting-optim'	blob \| diff \| raw \| diff to current
2018-03-08	Merge branch 'ds/find-unique-abbrev-optim'	blob \| diff \| raw \| diff to current
2018-03-08	Merge branch 'sg/travis-build-during-script-phase'	blob \| diff \| raw \| diff to current
2018-03-06	Merge branch 'xz/send-email-batch-size'	blob \| diff \| raw \| diff to current
2018-03-06	Merge branch 'sm/mv-dry-run-update'	blob \| diff \| raw \| diff to current
2018-03-06	Merge branch 'cb/ttk-style' of git-gui into cb/git...	blob \| diff \| raw \| diff to current
2018-03-02	Merge branch 'bb/ssh-key-files' of git-gui into bb...	blob \| diff \| raw \| diff to current
2018-03-02	Merge branch 'bp/bind-kp-enter' of git-gui into bp...	blob \| diff \| raw \| diff to current
2018-02-28	Merge branch 'tz/do-not-clean-spec-file'	blob \| diff \| raw \| diff to current
2018-02-28	Merge branch 'gs/test-unset-xdg-cache-home'	blob \| diff \| raw \| diff to current
2018-02-28	Merge branch 'tk/apply-dev-null-verify-name-fix'	blob \| diff \| raw \| diff to current
2018-02-28	Merge branch 'sb/status-doc-fix'	blob \| diff \| raw \| diff to current
2018-02-27	merge-recursive: fix overwriting dirty files involved...	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'nd/ita-wt-renames-in-status' into maint	blob \| diff \| raw \| diff to current
next