Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2018-05-30	Merge branch 'sb/submodule-update-try-harder'	blob \| diff \| raw
2018-05-30	Merge branch 'lm/credential-netrc'	blob \| diff \| raw
2018-05-30	Merge branch 'ab/get-short-oid'	blob \| diff \| raw
2018-05-30	Merge branch 'jt/partial-clone-proto-v2'	blob \| diff \| raw
2018-05-30	Merge branch 'bc/object-id'	blob \| diff \| raw
2018-05-30	Merge branch 'sb/blame-color'	blob \| diff \| raw
2018-05-30	Merge branch 'cf/submodule-progress-dissociate'	blob \| diff \| raw
2018-05-30	Merge branch 'sg/complete-paths'	blob \| diff \| raw
2018-05-30	Merge branch 'nd/travis-gcc-8'	blob \| diff \| raw
2018-05-30	Merge branch 'nd/pack-struct-commit'	blob \| diff \| raw
2018-05-30	Merge branch 'ma/create-pseudoref-with-null-old-oid'	blob \| diff \| raw
2018-05-30	Merge branch 'jk/unavailable-can-be-missing'	blob \| diff \| raw
2018-05-30	Merge branch 'bp/status-rename-config'	blob \| diff \| raw
2018-05-30	Merge branch 'js/use-bug-macro'	blob \| diff \| raw
2018-05-30	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'nd/repo-clear-keep-the-index'	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'ma/lockfile-cleanup'	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'sg/t6500-no-redirect-of-stdin'	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'bp/merge-rename-config'	blob \| diff \| raw \| diff to current
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-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-23	Merge branch 'js/no-pager-shorthand'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'tg/worktree-add-existing-branch'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'js/deprecate-grafts'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'js/test-unset-prereq'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'ab/perl-python-attrs'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'sb/oid-object-info'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'cc/perf-aggregate-unknown-option'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'en/git-debugger'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'bw/server-options'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'nd/repack-keep-pack'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'ds/lazy-load-trees'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'nd/term-columns'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'sg/t7005-spaces-in-filenames-cleanup'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'sg/t5516-fixes'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'sg/t5310-jgit-bitmap-test'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'nd/pack-format-doc'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'jk/apply-p-doc'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'ao/config-api-doc'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'bc/mailmap-self'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'hn/sort-ls-remote'	blob \| diff \| raw \| diff to current
2018-05-22	Sync with Git 2.16.4	blob \| diff \| raw \| diff to current
2018-05-22	Sync with Git 2.15.2	blob \| diff \| raw \| diff to current
2018-05-22	Sync with Git 2.14.4	blob \| diff \| raw \| diff to current
2018-05-22	Sync with Git 2.13.7	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: pass aggressive when rename detection is turned off	blob \| diff \| raw \| diff to current
2018-05-08	merge: add merge.renames config setting	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: fix check for skipability of working...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: make "Auto-merging" comment show for...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: fix remainder of was_dirty() to use...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: fix was_tracked() to quit lying with...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: avoid triggering add_cacheinfo error...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: move more is_dirty handling to merge_c...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: improve add_cacheinfo error handling	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: avoid spurious rename/rename conflict...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: fix remaining directory rename + dirty...	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: avoid clobbering untracked files with...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: apply necessary modifications for...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: when comparing files, don't include...	blob \| diff \| raw \| diff to current
2018-05-08	merge-recursive: check for file level conflicts then...	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: check for directory level conflicts	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 'ma/http-walker-no-partial'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'jc/parseopt-expiry-errors'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'ma/fast-export-skip-merge-fix'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'tz/doc-git-urls-reference'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'sa/send-email-dedup-some-headers'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'nd/submodule-status-fix'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'js/ident-date-fix'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'bt/gpg-interface'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'hn/sort-ls-remote'	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 'tb/config-default'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'tb/config-type'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'sg/doc-gc-quote-mismatch-fix'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'sg/completion-clear-cached'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'sb/worktree-remove-opt-force'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'tq/t1510'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'ls/checkout-encoding'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'ab/nuke-emacs-contrib'	blob \| diff \| raw \| diff to current
next