Andrew's git / gitweb.git / search
?
merge: pass aggressive when rename detection is turned off
2018-05-08 merge: pass aggressive when rename detection is turned off
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge: add merge.renames config setting
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge: update documentation for {merge,diff}.renameLimit
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: fix check for skipability of working...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: make "Auto-merging" comment show for...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: fix remainder of was_dirty() to use...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: fix was_tracked() to quit lying with...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 t6046: testcases checking whether updates can be skipped...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: avoid triggering add_cacheinfo error...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: move more is_dirty handling to merge_content
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: improve add_cacheinfo error handling
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: avoid spurious rename/rename conflict...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 directory rename detection: new testcases showcasing...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: fix remaining directory rename + dirty...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: fix overwriting dirty files involved...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: avoid clobbering untracked files with...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: apply necessary modifications for...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: when comparing files, don't include...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: check for file level conflicts then...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: add computation of collisions due...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: check for directory level conflicts
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-05-08 merge-recursive: add get_directory_renames()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 merge-recursive: make a helper function for cleanup...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 merge-recursive: split out code for determining diff_filepairs
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 merge-recursive: make !o->detect_rename codepath more...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 merge-recursive: fix leaks of allocated renames and...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 merge-recursive: introduce new functions to handle...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 merge-recursive: move the get_renames() function
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: tests for handling overwriting...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: tests for handling overwriting...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: miscellaneous testcases...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: testcases exploring possibly...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: more involved edge/corner...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: testcases checking which...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: files/directories in the...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: partially renamed directory...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: testcases to avoid taking...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: directory splitting testcases
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-20 directory rename detection: basic testcases
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-11 Merge branch 'svn/authors-prog-2' of git://bogomips...
diff | tree
2018-04-11 Revert "Merge branch 'en/rename-directory-detection'"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-11 The third batch for 2.18
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-11 Merge branch 'eb/cred-helper-ignore-sigpipe'
 diff | tree
2018-04-11 Merge branch 'lv/tls-1.3'
 diff | tree
2018-04-11 Merge branch 'pk/test-avoid-pipe-hiding-exit-status'
 diff | tree
2018-04-11 Merge branch 'rs/status-with-removed-submodule'
 diff | tree
2018-04-11 Merge branch 'nd/combined-test-helper'
 diff | tree
2018-04-11 Merge branch 'sb/packfiles-in-repository'
 diff | tree
2018-04-11 Merge branch 'sb/object-store'
 diff | tree
2018-04-11 Merge branch 'jc/test-must-be-empty'
 diff | tree
2018-04-11 Merge branch 'cc/perf-aggregate-sort'
 diff | tree
2018-04-11 Merge branch 'ab/doc-hash-brokenness'
 diff | tree
2018-04-11 Merge branch 'bc/hash-independent-tests'
 diff | tree
2018-04-11 Merge branch 'ab/drop-contrib-examples'
 diff | tree
2018-04-10 The second batch for 2.18
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-10 Merge branch 'ys/bisect-object-id-missing-conversion...
diff | tree
2018-04-10 Merge branch 'yk/filter-branch-non-committish-refs'
 diff | tree
2018-04-10 Merge branch 'nd/trace-with-env'
 diff | tree
2018-04-10 Merge branch 'nd/parseopt-completion-more'
 diff | tree
2018-04-10 Merge branch 'ds/bsearch-hash'
 diff | tree
2018-04-10 Merge branch 'ws/rebase-p'
 diff | tree
2018-04-10 Merge branch 'jk/diff-highlight-graph-fix'
 diff | tree
2018-04-10 Merge branch 'nd/remove-ignore-env-field'
 diff | tree
2018-04-10 Merge branch 'ps/contains-id-error-message'
 diff | tree
2018-04-09 The first batch for 2.18 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-09 Merge branch 'tg/stash-untracked-with-pathspec-fix'
 diff | tree
2018-04-09 Merge branch 'nd/worktree-prune'
 diff | tree
2018-04-09 Merge branch 'bc/object-id'
 diff | tree
2018-04-09 Merge branch 'ma/shortlog-revparse'
 diff | tree
2018-04-09 Merge branch 'ab/install-symlinks'
 diff | tree
2018-04-09 Merge branch 'ml/filter-branch-no-op-error'
 diff | tree
2018-04-09 Merge branch 'ab/pcre-v2'
 diff | tree
2018-04-09 Merge branch 'ti/fetch-everything-local-optim'
 diff | tree
2018-04-09 Merge branch 'en/rename-directory-detection'
 diff | tree
2018-04-02 Git 2.17
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-04-02 Merge tag 'l10n-2.17.0-rnd1' of git://github.com/git...
diff | tree
2018-04-02 Merge branch 'pw/add-p-single'
 diff | tree
2018-04-01 add -p: fix 2.17.0-rc* regression due to moved code
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-29 Merge branch 'jh/partial-clone'
 diff | tree
2018-03-29 upload-pack: disable object filtering when disabled...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-29 credential: ignore SIGPIPE when writing to credential...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-29 http: allow use of TLS 1.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 submodule: check for NULL return of get_submodule_ref_store()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 Git 2.17-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 Merge branch 'tg/stash-doc-typofix'
 diff | tree
2018-03-28 Merge branch 'pc/submodule-helper'
 diff | tree
2018-03-28 Merge branch 'nd/parseopt-completion'
 diff | tree
2018-03-28 test: avoid pipes in git related commands for test
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 submodule deinit: handle non existing pathspecs gracefully
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 git-stash.txt: remove extra square bracket
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 doc hash-function-transition: clarify what SHAttered...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 doc hash-function-transition: clarify how older gits...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 test_must_be_empty: simplify file existence check
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 perf/aggregate: add --sort-by=regression option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-28 perf/aggregate: add display_dir()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-27 t/helper: merge test-write-cache into test-tool
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-27 t/helper: merge test-wildmatch into test-tool
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-27 t/helper: merge test-urlmatch-normalization into test...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-27 t/helper: merge test-subprocess into test-tool
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-03-27 t/helper: merge test-submodule-config into test-tool
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree