projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
fetch: do not list refs if fetching only hashes
[git] / merge-recursive.c
2018-05-23  Junio C HamanoMerge branch 'tg/worktree-add-existing-branch' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'js/deprecate-grafts' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'js/test-unset-prereq' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'ab/perl-python-attrs' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'sb/oid-object-info' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'cc/perf-aggregate-unknown-option' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'en/git-debugger' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'bw/server-options' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'nd/repack-keep-pack' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'ds/lazy-load-trees' blob | commitdiff | raw
2018-05-23  Junio C HamanoMerge branch 'nd/term-columns' blob | commitdiff | raw | diff to current
2018-05-23  Junio C HamanoMerge branch 'sg/t7005-spaces-in-filenames-cleanup' blob | commitdiff | raw | diff to current
2018-05-23  Junio C HamanoMerge branch 'sg/t5516-fixes' blob | commitdiff | raw | diff to current
2018-05-23  Junio C HamanoMerge branch 'sg/t5310-jgit-bitmap-test' blob | commitdiff | raw | diff to current
2018-05-23  Junio C HamanoMerge branch 'nd/pack-format-doc' blob | commitdiff | raw | diff to current
2018-05-23  Junio C HamanoMerge branch 'jk/apply-p-doc' blob | commitdiff | raw | diff to current
2018-05-23  Junio C HamanoMerge branch 'ao/config-api-doc' blob | commitdiff | raw | diff to current
2018-05-23  Junio C HamanoMerge branch 'bc/mailmap-self' blob | commitdiff | raw | diff to current
2018-05-23  Junio C HamanoMerge branch 'hn/sort-ls-remote' blob | commitdiff | raw | diff to current
2018-05-22  Junio C HamanoSync with Git 2.16.4 blob | commitdiff | raw | diff to current
2018-05-22  Junio C HamanoSync with Git 2.15.2 blob | commitdiff | raw | diff to current
2018-05-22  Junio C HamanoSync with Git 2.14.4 blob | commitdiff | raw | diff to current
2018-05-22  Junio C HamanoSync with Git 2.13.7 blob | commitdiff | raw | diff to current
2018-05-22  Jeff KingMerge branch 'jk/submodule-name-verify-fix' into jk... blob | commitdiff | raw | diff to current
2018-05-22  Martin Ågrenunpack_trees_options: free messages when done blob | commitdiff | raw | diff to current
2018-05-21  Nguyễn Thái Ngọc Duymerge: use commit-slab in merge remote desc instead... blob | commitdiff | raw | diff to current
2018-05-20  Elijah Newrenmerge-recursive: provide pair of `unpack_trees_{start... blob | commitdiff | raw | diff to current
2018-05-17  Leif Middelschultemerge-recursive: give notice when submodule commit... blob | commitdiff | raw | diff to current
2018-05-16  Stefan Bellerobject-store: move object access functions to object... blob | commitdiff | raw | diff to current
2018-05-16  Stefan Belleralloc: allow arbitrary repositories for alloc functions blob | commitdiff | raw | diff to current
2018-05-16  Stefan Bellermerge-recursive: i18n submodule merge output and respec... blob | commitdiff | raw | diff to current
2018-05-16  Stefan Bellersubmodule.c: move submodule merging to merge-recursive.c blob | commitdiff | raw | diff to current
2018-05-09  Stefan Belleralloc: add repository argument to alloc_commit_node blob | commitdiff | raw | diff to current
2018-05-08  Ben Peartmerge: pass aggressive when rename detection is turned off blob | commitdiff | raw | diff to current
2018-05-08  Ben Peartmerge: add merge.renames config setting blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: fix check for skipability of working... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: make "Auto-merging" comment show for... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: fix remainder of was_dirty() to use... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: fix was_tracked() to quit lying with... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: avoid triggering add_cacheinfo error... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: move more is_dirty handling to merge_c... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: improve add_cacheinfo error handling blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: avoid spurious rename/rename conflict... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: fix remaining directory rename + dirty... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: fix overwriting dirty files involved... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: avoid clobbering untracked files with... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: apply necessary modifications for... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: when comparing files, don't include... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: check for file level conflicts then... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: add computation of collisions due... blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: check for directory level conflicts blob | commitdiff | raw | diff to current
2018-05-08  Elijah Newrenmerge-recursive: add get_directory_renames() blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'ma/http-walker-no-partial' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'jc/parseopt-expiry-errors' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'ma/fast-export-skip-merge-fix' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'tz/doc-git-urls-reference' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'sa/send-email-dedup-some-headers' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'nd/submodule-status-fix' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'js/ident-date-fix' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'bt/gpg-interface' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'hn/sort-ls-remote' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'ab/git-svn-get-record-typofix' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'tb/config-default' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'tb/config-type' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'sg/doc-gc-quote-mismatch-fix' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'sg/completion-clear-cached' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'sb/worktree-remove-opt-force' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'tq/t1510' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'ls/checkout-encoding' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'ab/nuke-emacs-contrib' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'nd/warn-more-for-devs' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'ds/commit-graph' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'js/empty-config-section-fix' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'ot/libify-get-ref-atom-value' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'sb/submodule-move-nested' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'ab/simplify-perl-makefile' blob | commitdiff | raw | diff to current
2018-05-08  Junio C HamanoMerge branch 'bw/protocol-v2' blob | commitdiff | raw | diff to current
2018-05-06  Johannes SchindelinReplace all die("BUG: ...") calls by BUG() ones blob | commitdiff | raw | diff to current
2018-05-02  Junio C HamanoMerge branch 'bw/protocol-v2' into jt/partial-clone... blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'jm/mem-pool' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'tg/use-git-contacts' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'cc/perf-bisect' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'bp/fsmonitor-bufsize-fix' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'cb/bash-completion-ls-files-processing' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'es/worktree-docs' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'es/fread-reads-dir-autoconf-fix' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'ps/test-chmtime-get' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'js/t5404-path-fix' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'jk/ref-array-push' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'en/doc-typoes' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'lw/daemon-log-destination' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'mn/send-email-credential-doc' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'ak/bisect-doc-typofix' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'br/mergetools-guiffy' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'nd/worktree-move' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'ks/branch-list-detached-rebase-i' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'jk/t5561-missing-curl' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'bw/commit-partial-from-subdirectory-fix' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'jk/relative-directory-fix' blob | commitdiff | raw | diff to current
2018-04-25  Junio C HamanoMerge branch 'jk/flockfile-stdio' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.