Thanks to visit codestin.com
Credit goes to github.com

This repository was archived by the owner on Oct 21, 2022. It is now read-only.

Commits

Commits on Jun 1, 2018

RelNotes: remove duplicate release note

newren
authored and
gitster
committed

Commits on May 25, 2018

rev-parse: check lookup'ed commit references for NULL

newren
authored and
gitster
committed

Commits on May 20, 2018

merge-recursive: provide pair of `unpack_trees_{start,finish}()`

newren
authored and
gitster
committed

Commits on May 8, 2018

merge-recursive: fix check for skipability of working tree updates

newren
authored and
gitster
committed
merge-recursive: make "Auto-merging" comment show for other merges

newren
authored and
gitster
committed
merge-recursive: fix remainder of was_dirty() to use original index

newren
authored and
gitster
committed
merge-recursive: fix was_tracked() to quit lying with some renamed paths

newren
authored and
gitster
committed
t6046: testcases checking whether updates can be skipped in a merge

newren
authored and
gitster
committed
merge-recursive: avoid triggering add_cacheinfo error with dirty mod

newren
authored and
gitster
committed
merge-recursive: move more is_dirty handling to merge_content

newren
authored and
gitster
committed
merge-recursive: improve add_cacheinfo error handling

newren
authored and
gitster
committed
merge-recursive: avoid spurious rename/rename conflict from dir renames

newren
authored and
gitster
committed
directory rename detection: new testcases showcasing a pair of bugs

newren
authored and
gitster
committed
merge-recursive: fix remaining directory rename + dirty overwrite cases

newren
authored and
gitster
committed
merge-recursive: fix overwriting dirty files involved in renames

newren
authored and
gitster
committed
merge-recursive: avoid clobbering untracked files with directory renames

newren
authored and
gitster
committed
merge-recursive: apply necessary modifications for directory renames

newren
authored and
gitster
committed
merge-recursive: when comparing files, don't include trees

newren
authored and
gitster
committed
merge-recursive: check for file level conflicts then get new name

newren
authored and
gitster
committed
merge-recursive: add computation of collisions due to dir rename & merging

newren
authored and
gitster
committed
merge-recursive: check for directory level conflicts

newren
authored and
gitster
committed
merge-recursive: add get_directory_renames()

newren
authored and
gitster
committed

Commits on May 2, 2018

unpack_trees: fix breakage when o->src_index != o->dst_index

newren
authored and
gitster
committed

Commits on Apr 25, 2018

Make running git under other debugger-like programs easy

newren
authored and
gitster
committed

Commits on Apr 20, 2018

merge-recursive: make a helper function for cleanup for handle_renames

newren
authored and
gitster
committed
merge-recursive: split out code for determining diff_filepairs

newren
authored and
gitster
committed
merge-recursive: make !o->detect_rename codepath more obvious

newren
authored and
gitster
committed
merge-recursive: fix leaks of allocated renames and diff_filepairs

newren
authored and
gitster
committed
merge-recursive: introduce new functions to handle rename logic

newren
authored and
gitster
committed
merge-recursive: move the get_renames() function

newren
authored and
gitster
committed
directory rename detection: tests for handling overwriting dirty files

newren
authored and
gitster
committed
directory rename detection: tests for handling overwriting untracked files

newren
authored and
gitster
committed
directory rename detection: miscellaneous testcases to complete coverage

newren
authored and
gitster
committed
directory rename detection: testcases exploring possibly suboptimal merges

newren
authored and
gitster
committed
directory rename detection: more involved edge/corner testcases

newren
authored and
gitster
committed