aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
...
| * merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren2011-08-14
| * merge-recursive: Avoid working directory changes during recursive caseElijah Newren2011-08-14
| * merge-recursive: Remember to free generated unique path namesElijah Newren2011-08-14
| * merge-recursive: Consolidate different update_stages functionsElijah Newren2011-08-14
| * merge-recursive: Mark some diff_filespec struct arguments constElijah Newren2011-08-14
| * merge-recursive: Correct a commentElijah Newren2011-08-14
| * merge-recursive: Make BUG message more legible by adding a newlineElijah Newren2011-08-14
| * Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-31
| |\
* | \ Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano2011-08-25
|\ \ \
| * | | merge-recursive: take advantage of hardcoded empty treeJonathan Nieder2011-08-16
* | | | teach --histogram to diffTay Ray Chuan2011-07-12
* | | | Revert "Merge branch 'en/merge-recursive'"Junio C Hamano2011-05-19
* | | | Merge branch 'maint'Junio C Hamano2011-05-14
|\ \ \ \ | | |/ / | |/| |
| * | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-14
* | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-06
|\ \ \ \
| * | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-25
* | | | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-28
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-22
* | | | | Merge branch 'en/merge-recursive'Junio C Hamano2011-04-28
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | merge-recursive: tweak magic band-aidJunio C Hamano2011-03-17
| * | | | merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-03-02
* | | | | Fix two unused variable warnings in gcc 4.6Dan McGee2011-04-03
| |/ / / |/| | |
* | | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-19
|\ \ \ \
| * | | | merge: enable progress reporting for rename detectionJeff King2011-02-21
| * | | | bump rename limit defaults (again)Jeff King2011-02-21
| * | | | merge: improve inexact rename limit warningJeff King2011-02-21
| | |/ / | |/| |
* | | | Merge branch 'maint'Junio C Hamano2011-03-16
|\ \ \ \
| * | | | standardize brace placement in struct definitionsJonathan Nieder2011-03-16
| |/ / /
* | | | strbuf: add strbuf_vaddfJeff King2011-02-26
|/ / /
* | | Merge branch 'en/merge-recursive'Junio C Hamano2010-11-29
|\ \ \ | |/ /
| * | 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
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-11 18:28:53 +0000