aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2010-12-01
|\
| * Merge branch 'maint-1.7.2' into maintJunio C Hamano2010-12-01
| |\
| | * Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2010-12-01
| | |\
| | | * Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-12-01
| | | |\
| | | | * add: introduce add.ignoreerrors synonym for add.ignore-errorsJonathan Nieder2010-12-01
| | * | | bash: Match lightweight tags in promptknittl2010-12-01
| | * | | git-commit.txt: (synopsis): move -i and -o before "--"Jari Aalto2010-12-01
* | | | | commit.c: Remove backward goto in read_craft_line()Ralf Thielow2010-12-01
* | | | | Merge branch 'cb/leading-path-removal'Junio C Hamano2010-11-29
|\ \ \ \ \
| * | | | | use persistent memory for rejected pathsClemens Buchacher2010-11-15
| * | | | | do not overwrite files in leading pathClemens Buchacher2010-10-13
| * | | | | lstat_cache: optionally return match_lenClemens Buchacher2010-10-13
| * | | | | add function check_ok_to_remove()Clemens Buchacher2010-10-13
| * | | | | t7607: add leading-path testsClemens Buchacher2010-10-13
| * | | | | t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-10-13
* | | | | | Merge branch 'en/merge-recursive'Junio C Hamano2010-11-29
|\ \ \ \ \ \
| * | | | | | t6022: Use -eq not = to test output of wc -lBrian Gernhardt2010-11-17
| * | | | | | merge-recursive:make_room_for_directories - work around dumb compilersJunio C Hamano2010-10-21
| * | | | | | merge-recursive: Remove redundant path clearing for D/F conflictsElijah Newren2010-09-29
| * | | | | | merge-recursive: Make room for directories in D/F conflictsElijah Newren2010-09-29
| * | | | | | handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
| * | | | | | merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
| * | | | | | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-29
| * | | | | | conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
| * | | | | | merge-recursive: Delay modify/delete conflicts if D/F conflict presentElijah Newren2010-09-29
| * | | | | | merge-recursive: Delay content merging for renamesElijah Newren2010-09-29
| * | | | | | merge-recursive: Delay handling of rename/delete conflictsElijah Newren2010-09-29
| * | | | | | merge-recursive: Move handling of double rename of one file to other fileElijah Newren2010-09-29
| * | | | | | merge-recursive: Move handling of double rename of one file to twoElijah Newren2010-09-29
| * | | | | | merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren2010-09-29
| * | | | | | merge-recursive: Update merge_content() call signatureElijah Newren2010-09-29
| * | | | | | merge-recursive: Update conflict_rename_rename_1to2() call signatureElijah Newren2010-09-29
| * | | | | | merge-recursive: Structure process_df_entry() to handle more casesElijah Newren2010-09-29
| * | | | | | merge-recursive: Have process_entry() skip D/F or rename entriesElijah Newren2010-09-29
| * | | | | | merge-recursive: New function to assist resolving renames in-core onlyElijah Newren2010-09-29
| * | | | | | merge-recursive: New data structures for deferring of D/F conflictsElijah Newren2010-09-29
| * | | | | | merge-recursive: Move process_entry's content merging into a functionElijah Newren2010-09-29
| * | | | | | merge-recursive: Move delete/modify handling into dedicated functionElijah Newren2010-09-29
| * | | | | | merge-recursive: Move rename/delete handling into dedicated functionElijah Newren2010-09-29
| * | | | | | merge-recursive: Nuke rename/directory conflict detectionElijah Newren2010-09-29
| * | | | | | merge-recursive: Rename conflict_rename_rename*() for clarityElijah Newren2010-09-29
| * | | | | | merge-recursive: Small code clarification -- variable name and commentsElijah Newren2010-09-29
| * | | | | | t6036: Add testcase for undetected conflictElijah Newren2010-09-29
| * | | | | | t6036: Add a second testcase similar to the first but with content changesElijah Newren2010-09-29
| * | | | | | t6036: Test index and worktree state, not just that merge failsElijah Newren2010-09-29
| * | | | | | t6020: Add a testcase for modify/delete + directory/file conflictElijah Newren2010-09-29
| * | | | | | t6020: Modernize style a bitElijah Newren2010-09-29
| * | | | | | t6022: Add tests for rename/rename combined with D/F conflictsElijah Newren2010-09-29
| * | | | | | t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Elijah Newren2010-09-29
| * | | | | | t6022: Add tests with both rename source & dest involved in D/F conflictsElijah Newren2010-09-29
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-09 05:05:47 +0000