Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-recursive: use xstrdup() instead of fixed buffer
[gitweb.git]
/
merge-recursive.c
2018-06-14
merge-recursive: use xstrdup() instead of fixed buffer
blob
|
diff
|
raw
2018-02-27
merge-recursive: ensure we write updates for directory...
blob
|
diff
|
raw
|
diff to current
2018-02-27
merge-recursive: avoid spurious rename/rename conflict...
blob
|
diff
|
raw
|
diff to current
2018-02-27
merge-recursive: fix remaining directory rename + dirty...
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-recursive: avoid clobbering untracked files with...
blob
|
diff
|
raw
|
diff to current
2018-02-27
merge-recursive: apply necessary modifications for...
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: when comparing files, don't include...
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: check for file level conflicts then...
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: add computation of collisions due...
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: check for directory level conflicts
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: add get_directory_renames()
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: make a helper function for cleanup...
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: split out code for determining diff_fi...
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: make !o->detect_rename codepath more...
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: fix leaks of allocated renames and...
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: introduce new functions to handle...
blob
|
diff
|
raw
|
diff to current
2018-02-14
merge-recursive: move the get_renames() function
blob
|
diff
|
raw
|
diff to current
2018-01-19
merge-recursive: add explanation for src_entry and...
blob
|
diff
|
raw
|
diff to current
2018-01-19
merge-recursive: fix logic ordering issue
blob
|
diff
|
raw
|
diff to current
2018-01-16
Merge tag 'l10n-2.16.0-rnd2' of git://github.com/git...
blob
|
diff
|
raw
|
diff to current
2018-01-11
Merge branch 'jh/object-filtering'
blob
|
diff
|
raw
|
diff to current
2018-01-11
Merge branch 'tg/worktree-create-tracking'
blob
|
diff
|
raw
|
diff to current
2018-01-11
Merge branch 'js/test-with-ws-in-path'
blob
|
diff
|
raw
|
diff to current
2018-01-10
Merge branch 'js/perl-path-workaround-in-tests'
blob
|
diff
|
raw
|
diff to current
2018-01-10
Merge branch 'ew/empty-merge-with-dirty-index'
blob
|
diff
|
raw
|
diff to current
2018-01-10
Merge branch 'ma/bisect-leakfix'
blob
|
diff
|
raw
|
diff to current
2018-01-10
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'jk/doc-diff-options'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'bw/protocol-v1'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'sg/travis-check-untracked'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'js/test-with-ws-in-path'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'bc/submitting-patches-in-asciidoc'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'sg/travis-skip-identical-test'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'ab/dc-sha1-loose-ends'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'sg/travis-fixes'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'js/misc-git-gui-stuff' of ../git-gui
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'ew/empty-merge-with-dirty-index-maint...
blob
|
diff
|
raw
|
diff to current
2018-01-09
merge-recursive: do not look at the index during recurs...
blob
|
diff
|
raw
|
diff to current
2018-01-06
Merge branch 'master' of git://github.com/git-l10n...
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'js/sequencer-cleanups'
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'jh/memihash-opt'
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'tb/test-lint-wc-l'
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'rs/use-argv-array-in-child-process'
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'ld/p4-multiple-shelves'
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'jd/fix-strbuf-add-urlencode-bytes'
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'ew/empty-merge-with-dirty-index'
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'db/doc-config-section-names-with-bs'
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'jk/test-suite-tracing'
blob
|
diff
|
raw
|
diff to current
2017-12-31
Merge branch 'maint' of git://github.com/git-l10n/git-po
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'sb/describe-blob'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'hi/merge-verify-sig-config'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'ws/curl-http-proxy-over-https'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'ks/doc-previous-checkout'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'ks/rebase-error-messages'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'sr/http-sslverify-config-doc'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'nm/imap-send-quote-server-folder-name'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'bp/fsmonitor'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'jh/partial-clone-doc'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'jt/transport-hide-vtable'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'js/enhanced-version-info'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'tz/lib-git-svn-svnserve-tests'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'ew/svn-crlf'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'cc/skip-to-optional-val'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'ra/prompt-eread-fix'
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'bw/path-doc'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'rb/quick-install-doc'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'jt/transport-no-more-rsync'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'sg/travis-fixes'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'sb/test-helper-excludes'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'ot/pretty'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'bw/submodule-sans-cache-compat'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'es/clone-shared-worktree'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'tb/delimit-pretty-trailers-args-with...
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'rs/fmt-merge-msg-leakfix'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'jt/decorate-api'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'jk/cvsimport-quoting'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'db/doc-workflows-neuter-the-maintainer'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'ks/branch-cleanup'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'rs/strbuf-read-once-reset-length'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'rs/fmt-merge-msg-string-leak-fix'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'rs/am-builtin-leakfix'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'es/worktree-checkout-hook'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'lb/rebase-i-short-command-names'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'tb/check-crlf-for-safe-crlf'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'jh/object-filtering'
blob
|
diff
|
raw
|
diff to current
2017-12-22
Merge branch 'ew/empty-merge-with-dirty-index-maint...
blob
|
diff
|
raw
|
diff to current
2017-12-22
merge-recursive: avoid incorporating uncommitted change...
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'ls/editor-waiting-message'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'sg/setup-doc-update'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'ar/unconfuse-three-dots'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'tg/worktree-create-tracking'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'gk/tracing-optimization'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'bw/submodule-config-cleanup'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'sb/clone-recursive-submodule-doc'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'ls/git-gui-no-double-utf8-author-name'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'bw/pathspec-match-submodule-boundary'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'jt/diff-anchored-patience'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'en/merge-recursive-icase-removal'
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'en/rename-progress'
blob
|
diff
|
raw
|
diff to current
next