Merge branch 'js/rebase-recreate-merge'
[gitweb.git] / merge-recursive.c
2018-05-23 Merge branch 'js/rebase-recreate-merge'
2018-05-23 Merge branch 'nd/pack-objects-pack-struct'
2018-05-23 Merge branch 'en/rename-directory-detection-reboot'
2018-05-23 Merge branch 'js/no-pager-shorthand'
2018-05-23 Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'
2018-05-23 Merge branch 'tg/worktree-add-existing-branch'
2018-05-23 Merge branch 'js/deprecate-grafts'
2018-05-23 Merge branch 'js/test-unset-prereq'
2018-05-23 Merge branch 'ab/perl-python-attrs'
2018-05-23 Merge branch 'sb/oid-object-info'
2018-05-23 Merge branch 'cc/perf-aggregate-unknown-option'
2018-05-23 Merge branch 'en/git-debugger'
2018-05-23 Merge branch 'bw/server-options'
2018-05-23 Merge branch 'nd/repack-keep-pack'
2018-05-23 Merge branch 'ds/lazy-load-trees'
2018-05-23 Merge branch 'nd/term-columns'
2018-05-23 Merge branch 'sg/t7005-spaces-in-filenames-cleanup'
2018-05-23 Merge branch 'sg/t5516-fixes'
2018-05-23 Merge branch 'sg/t5310-jgit-bitmap-test'
2018-05-23 Merge branch 'nd/pack-format-doc'
2018-05-23 Merge branch 'jk/apply-p-doc'
2018-05-23 Merge branch 'ao/config-api-doc'
2018-05-23 Merge branch 'bc/mailmap-self'
2018-05-23 Merge branch 'hn/sort-ls-remote'
2018-05-08 merge-recursive: fix check for skipability of working...
2018-05-08 merge-recursive: make "Auto-merging" comment show for...
2018-05-08 merge-recursive: fix remainder of was_dirty() to use...
2018-05-08 merge-recursive: fix was_tracked() to quit lying with...
2018-05-08 merge-recursive: avoid triggering add_cacheinfo error...
2018-05-08 merge-recursive: move more is_dirty handling to merge_c...
2018-05-08 merge-recursive: improve add_cacheinfo error handling
2018-05-08 merge-recursive: avoid spurious rename/rename conflict...
2018-05-08 merge-recursive: fix remaining directory rename + dirty...
2018-05-08 merge-recursive: fix overwriting dirty files involved...
2018-05-08 merge-recursive: avoid clobbering untracked files with...
2018-05-08 merge-recursive: apply necessary modifications for...
2018-05-08 merge-recursive: when comparing files, don't include...
2018-05-08 merge-recursive: check for file level conflicts then...
2018-05-08 merge-recursive: add computation of collisions due...
2018-05-08 merge-recursive: check for directory level conflicts
2018-05-08 merge-recursive: add get_directory_renames()
2018-05-08 Merge branch 'ma/http-walker-no-partial'
2018-05-08 Merge branch 'jc/parseopt-expiry-errors'
2018-05-08 Merge branch 'ma/fast-export-skip-merge-fix'
2018-05-08 Merge branch 'tz/doc-git-urls-reference'
2018-05-08 Merge branch 'sa/send-email-dedup-some-headers'
2018-05-08 Merge branch 'nd/submodule-status-fix'
2018-05-08 Merge branch 'js/ident-date-fix'
2018-05-08 Merge branch 'bt/gpg-interface'
2018-05-08 Merge branch 'hn/sort-ls-remote'
2018-05-08 Merge branch 'ab/git-svn-get-record-typofix'
2018-05-08 Merge branch 'tb/config-default'
2018-05-08 Merge branch 'tb/config-type'
2018-05-08 Merge branch 'sg/doc-gc-quote-mismatch-fix'
2018-05-08 Merge branch 'sg/completion-clear-cached'
2018-05-08 Merge branch 'sb/worktree-remove-opt-force'
2018-05-08 Merge branch 'tq/t1510'
2018-05-08 Merge branch 'ls/checkout-encoding'
2018-05-08 Merge branch 'ab/nuke-emacs-contrib'
2018-05-08 Merge branch 'nd/warn-more-for-devs'
2018-05-08 Merge branch 'ds/commit-graph'
2018-05-08 Merge branch 'js/empty-config-section-fix'
2018-05-08 Merge branch 'ot/libify-get-ref-atom-value'
2018-05-08 Merge branch 'sb/submodule-move-nested'
2018-05-08 Merge branch 'ab/simplify-perl-makefile'
2018-05-08 Merge branch 'bw/protocol-v2'
2018-04-25 Merge branch 'jm/mem-pool'
2018-04-25 Merge branch 'tg/use-git-contacts'
2018-04-25 Merge branch 'cc/perf-bisect'
2018-04-25 Merge branch 'bp/fsmonitor-bufsize-fix'
2018-04-25 Merge branch 'cb/bash-completion-ls-files-processing'
2018-04-25 Merge branch 'es/worktree-docs'
2018-04-25 Merge branch 'es/fread-reads-dir-autoconf-fix'
2018-04-25 Merge branch 'ps/test-chmtime-get'
2018-04-25 Merge branch 'js/t5404-path-fix'
2018-04-25 Merge branch 'jk/ref-array-push'
2018-04-25 Merge branch 'en/doc-typoes'
2018-04-25 Merge branch 'lw/daemon-log-destination'
2018-04-25 Merge branch 'mn/send-email-credential-doc'
2018-04-25 Merge branch 'ak/bisect-doc-typofix'
2018-04-25 Merge branch 'br/mergetools-guiffy'
2018-04-25 Merge branch 'nd/worktree-move'
2018-04-25 Merge branch 'ks/branch-list-detached-rebase-i'
2018-04-25 Merge branch 'jk/t5561-missing-curl'
2018-04-25 Merge branch 'bw/commit-partial-from-subdirectory-fix'
2018-04-25 Merge branch 'jk/relative-directory-fix'
2018-04-25 Merge branch 'jk/flockfile-stdio'
2018-04-25 Merge branch 'pw/rebase-signoff'
2018-04-25 Merge branch 'pw/rebase-keep-empty-fixes'
2018-04-25 Merge branch 'cb/git-gui-ttk-style'
2018-04-25 Merge branch 'bp/git-gui-bind-kp-enter'
2018-04-25 Merge branch 'bb/git-gui-ssh-key-files'
2018-04-24 Merge branch 'bw/protocol-v2' into HEAD
2018-04-20 merge-recursive: make a helper function for cleanup...
2018-04-20 merge-recursive: split out code for determining diff_fi...
2018-04-20 merge-recursive: make !o->detect_rename codepath more...
2018-04-20 merge-recursive: fix leaks of allocated renames and...
2018-04-20 merge-recursive: introduce new functions to handle...
2018-04-20 merge-recursive: move the get_renames() function
2018-04-11 Merge branch 'svn/authors-prog-2' of git://bogomips...
next