git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - merge-recursive.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / merge-recursive.c

2018-05-08	Elijah Newren	merge-recursive: fix overwriting dirty files involved...	blob \| commitdiff \| raw
2018-05-08	Elijah Newren	merge-recursive: avoid clobbering untracked files with...	blob \| commitdiff \| raw \| diff to current
2018-05-08	Elijah Newren	merge-recursive: apply necessary modifications for...	blob \| commitdiff \| raw \| diff to current
2018-05-08	Elijah Newren	merge-recursive: when comparing files, don't include...	blob \| commitdiff \| raw \| diff to current
2018-05-08	Elijah Newren	merge-recursive: check for file level conflicts then...	blob \| commitdiff \| raw \| diff to current
2018-05-08	Elijah Newren	merge-recursive: add computation of collisions due...	blob \| commitdiff \| raw \| diff to current
2018-05-08	Elijah Newren	merge-recursive: check for directory level conflicts	blob \| commitdiff \| raw \| diff to current
2018-05-08	Elijah Newren	merge-recursive: add get_directory_renames()	blob \| commitdiff \| raw \| diff to current
2018-04-20	Elijah Newren	merge-recursive: make a helper function for cleanup...	blob \| commitdiff \| raw \| diff to current
2018-04-20	Elijah Newren	merge-recursive: split out code for determining diff_fi...	blob \| commitdiff \| raw \| diff to current
2018-04-20	Elijah Newren	merge-recursive: make !o->detect_rename codepath more...	blob \| commitdiff \| raw \| diff to current
2018-04-20	Elijah Newren	merge-recursive: fix leaks of allocated renames and...	blob \| commitdiff \| raw \| diff to current
2018-04-20	Elijah Newren	merge-recursive: introduce new functions to handle...	blob \| commitdiff \| raw \| diff to current
2018-04-20	Elijah Newren	merge-recursive: move the get_renames() function	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'svn/authors-prog-2' of git://bogomips...	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Revert "Merge branch 'en/rename-directory-detection'"	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'eb/cred-helper-ignore-sigpipe'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'lv/tls-1.3'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'pk/test-avoid-pipe-hiding-exit-status'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'rs/status-with-removed-submodule'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'nd/combined-test-helper'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'sb/packfiles-in-repository'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'sb/object-store'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'jc/test-must-be-empty'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'cc/perf-aggregate-sort'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'ab/doc-hash-brokenness'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'bc/hash-independent-tests'	blob \| commitdiff \| raw \| diff to current
2018-04-11	Junio C Hamano	Merge branch 'ab/drop-contrib-examples'	blob \| commitdiff \| raw \| diff to current
2018-04-10	Junio C Hamano	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| commitdiff \| raw \| diff to current
2018-04-10	Junio C Hamano	Merge branch 'yk/filter-branch-non-committish-refs'	blob \| commitdiff \| raw \| diff to current
2018-04-10	Junio C Hamano	Merge branch 'nd/trace-with-env'	blob \| commitdiff \| raw \| diff to current
2018-04-10	Junio C Hamano	Merge branch 'nd/parseopt-completion-more'	blob \| commitdiff \| raw \| diff to current
2018-04-10	Junio C Hamano	Merge branch 'ds/bsearch-hash'	blob \| commitdiff \| raw \| diff to current
2018-04-10	Junio C Hamano	Merge branch 'ws/rebase-p'	blob \| commitdiff \| raw \| diff to current
2018-04-10	Junio C Hamano	Merge branch 'jk/diff-highlight-graph-fix'	blob \| commitdiff \| raw \| diff to current
2018-04-10	Junio C Hamano	Merge branch 'nd/remove-ignore-env-field'	blob \| commitdiff \| raw \| diff to current
2018-04-10	Junio C Hamano	Merge branch 'ps/contains-id-error-message'	blob \| commitdiff \| raw \| diff to current
2018-04-09	Junio C Hamano	Merge branch 'tg/stash-untracked-with-pathspec-fix'	blob \| commitdiff \| raw \| diff to current
2018-04-09	Junio C Hamano	Merge branch 'nd/worktree-prune'	blob \| commitdiff \| raw \| diff to current
2018-04-09	Junio C Hamano	Merge branch 'bc/object-id'	blob \| commitdiff \| raw \| diff to current
2018-04-09	Junio C Hamano	Merge branch 'ma/shortlog-revparse'	blob \| commitdiff \| raw \| diff to current
2018-04-09	Junio C Hamano	Merge branch 'ab/install-symlinks'	blob \| commitdiff \| raw \| diff to current
2018-04-09	Junio C Hamano	Merge branch 'ml/filter-branch-no-op-error'	blob \| commitdiff \| raw \| diff to current
2018-04-09	Junio C Hamano	Merge branch 'ab/pcre-v2'	blob \| commitdiff \| raw \| diff to current
2018-04-09	Junio C Hamano	Merge branch 'ti/fetch-everything-local-optim'	blob \| commitdiff \| raw \| diff to current
2018-04-09	Junio C Hamano	Merge branch 'en/rename-directory-detection'	blob \| commitdiff \| raw \| diff to current
2018-04-02	Junio C Hamano	Merge tag 'l10n-2.17.0-rnd1' of git://github.com/git...	blob \| commitdiff \| raw \| diff to current
2018-04-02	Junio C Hamano	Merge branch 'pw/add-p-single'	blob \| commitdiff \| raw \| diff to current
2018-03-29	Junio C Hamano	Merge branch 'jh/partial-clone'	blob \| commitdiff \| raw \| diff to current
2018-03-28	Junio C Hamano	Merge branch 'tg/stash-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2018-03-28	Junio C Hamano	Merge branch 'pc/submodule-helper'	blob \| commitdiff \| raw \| diff to current
2018-03-28	Junio C Hamano	Merge branch 'nd/parseopt-completion'	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Sync with Git 2.16.3	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'sm/mv-dry-run-update' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'tg/worktree-create-tracking' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'gs/test-unset-xdg-cache-home' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'sb/status-doc-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'rd/typofix' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'bp/fsmonitor' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'bc/doc-interpret-trailers-grammofix'...	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'sg/doc-test-must-fail-args' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'rj/sparse-updates' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'jk/gettext-poison' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'nd/ignore-glob-doc-update' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'rs/cocci-strbuf-addf-to-addstr' into...	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'jc/worktree-add-short-help' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'tz/doc-show-defaults-to-head' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'nd/shared-index-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'jc/mailinfo-cleanup-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'rb/hashmap-h-compilation-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'rs/describe-unique-abbrev' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'ks/submodule-doc-updates' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'cl/t9001-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'bw/oidmap-autoinit' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'sg/test-i18ngrep' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'jt/fsck-code-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'ew/svn-branch-segfault-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'nd/list-merge-strategy' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'jk/daemon-fixes' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'tg/split-index-fixes' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'mr/packed-ref-store-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'jt/http-redact-cookies' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'nd/diff-flush-before-warning' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'sg/travis-build-during-script-phase'...	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'jk/attributes-path-doc'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'rj/warning-uninitialized-fix'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'tz/complete-tag-delete-tagname'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'ml/filter-branch-portability-fix'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'js/ming-strftime'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'dp/merge-strategy-doc-fix'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'tz/relnotes-1.7-on-perl'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'rj/http-code-cleanup'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'ks/t3200-typofix'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'jt/transfer-fsck-with-promissor'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'bp/refresh-cache-ent-rehash-fix'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'jh/fsck-promisors'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'ma/skip-writing-unchanged-index'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'ma/config-page-only-in-list-mode'	blob \| commitdiff \| raw \| diff to current
2018-03-21	Jiang Xin	Merge branch 'master' of https://github.com/Softcatala...	blob \| commitdiff \| raw \| diff to current
2018-03-20	Ramsay Jones	-Wuninitialized: remove some 'init-self' workarounds	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom