Git

Settings | Report Duplicate

I Use This!

Very High Activity

Commits : Listings

Analyzed about 4 hours ago. based on code collected about 9 hours ago.

Commit Message	Contributor	Files Modified	Lines Added	Lines Removed	Code Location	Date
Apr 24, 2023 — Apr 24, 2024 Showing page 1,651 of 2,434 Search / Filter on:
merge-recursive: Avoid doubly merging rename/add conflict contents	Elijah Newren	More...				over 13 years ago
merge-recursive: Update merge_content() call signature	Elijah Newren	More...				over 13 years ago
merge-recursive: Update conflict_rename_rename_1to2() call signature	Elijah Newren	More...				over 13 years ago
merge-recursive: Structure process_df_entry() to handle more cases	Elijah Newren	More...				over 13 years ago
merge-recursive: Have process_entry() skip D/F or rename entries	Elijah Newren	More...				over 13 years ago
merge-recursive: New function to assist resolving renames in-core only	Elijah Newren	More...				over 13 years ago
merge-recursive: New data structures for deferring of D/F conflicts	Elijah Newren	More...				over 13 years ago
merge-recursive: Move process_entry's content merging into a function	Elijah Newren	More...				over 13 years ago
merge-recursive: Move delete/modify handling into dedicated function	Elijah Newren	More...				over 13 years ago
merge-recursive: Move rename/delete handling into dedicated function	Elijah Newren	More...				over 13 years ago
merge-recursive: Nuke rename/directory conflict detection	Elijah Newren	More...				over 13 years ago
merge-recursive: Rename conflict_rename_rename*() for clarity	Elijah Newren	More...				over 13 years ago
merge-recursive: Small code clarification -- variable name and comments	Elijah Newren	More...				over 13 years ago
t6036: Add testcase for undetected conflict	Elijah Newren	More...				over 13 years ago
t6036: Add a second testcase similar to the first but with content changes	Elijah Newren	More...				over 13 years ago
t6036: Test index and worktree state, not just that merge fails	Elijah Newren	More...				over 13 years ago
t6020: Add a testcase for modify/delete + directory/file conflict	Elijah Newren	More...				over 13 years ago
t6020: Modernize style a bit	Elijah Newren	More...				over 13 years ago
t6022: Add tests for rename/rename combined with D/F conflicts	Elijah Newren	More...				over 13 years ago
t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)	Elijah Newren	More...				over 13 years ago
t6022: Add tests with both rename source & dest involved in D/F conflicts	Elijah Newren	More...				over 13 years ago
t6022: Add tests for reversing order of merges when D/F conflicts present	Elijah Newren	More...				over 13 years ago
t6022: Add test combinations of {content conflict?, D/F conflict remains?}	Elijah Newren	More...				over 13 years ago
t6032: Add a test checking for excessive output from merge	Elijah Newren	More...				over 13 years ago
merge-recursive: Restructure showing how to chain more process_* functions	Junio C Hamano	More...				over 13 years ago
t3030: Add a testcase for resolvable rename/add conflict with symlinks	Schalk, Ken	More...				over 13 years ago
Add testcases showing how pathspecs are handled with rev-list --objects	Elijah Newren	More...				over 13 years ago
do not search functions for patch ID	Clemens Buchacher	More...				over 13 years ago
add rebase patch id tests	Clemens Buchacher	More...				over 13 years ago
Git 1.7.3	Junio C Hamano	More...				over 13 years ago

←
1
2
…
1647
1648
1649
1650
1651
1652
1653
1654
1655
…
2433
2434
→