| Commit message (Expand) | Author | Age |
... | |
| * | | merge-recursive: Make BUG message more legible by adding a newline | Elijah Newren | 2011-08-14 |
| * | | Merge branch 'jc/rename-degrade-cc-to-c' into maint | Junio C Hamano | 2011-05-31 |
| |\ \ |
|
* | \ \ | Merge branch 'jn/plug-empty-tree-leak' | Junio C Hamano | 2011-08-25 |
|\ \ \ \ |
|
| * | | | | merge-recursive: take advantage of hardcoded empty tree | Jonathan Nieder | 2011-08-16 |
* | | | | | teach --histogram to diff | Tay Ray Chuan | 2011-07-12 |
* | | | | | Revert "Merge branch 'en/merge-recursive'" | Junio C Hamano | 2011-05-19 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-14 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | add, merge, diff: do not use strcasecmp to compare config variable names | Jonathan Nieder | 2011-05-14 |
* | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ |
|
| * | | | | | Convert read_tree{,_recursive} to support struct pathspec | Nguyễn Thái Ngọc Duy | 2011-03-25 |
* | | | | | | Merge branch 'jc/rename-degrade-cc-to-c' | Junio C Hamano | 2011-04-28 |
|\ \ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| * | | | | | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 |
* | | | | | | Merge branch 'en/merge-recursive' | Junio C Hamano | 2011-04-28 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| * | | | | | merge-recursive: tweak magic band-aid | Junio C Hamano | 2011-03-17 |
| * | | | | | merge-recursive: When we detect we can skip an update, actually skip it | Elijah Newren | 2011-03-02 |
* | | | | | | Fix two unused variable warnings in gcc 4.6 | Dan McGee | 2011-04-03 |
| |/ / / /
|/| | | | |
|
* | | | | | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 |
|\ \ \ \ \ |
|
| * | | | | | merge: enable progress reporting for rename detection | Jeff King | 2011-02-21 |
| * | | | | | bump rename limit defaults (again) | Jeff King | 2011-02-21 |
| * | | | | | merge: improve inexact rename limit warning | Jeff King | 2011-02-21 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-16 |
|\ \ \ \ \ |
|
| * | | | | | standardize brace placement in struct definitions | Jonathan Nieder | 2011-03-16 |
| |/ / / / |
|
* | | | | | strbuf: add strbuf_vaddf | Jeff King | 2011-02-26 |
|/ / / / |
|
* | | | | Merge branch 'en/merge-recursive' | Junio C Hamano | 2010-11-29 |
|\ \ \ \
| |/ / / |
|
| * | | | merge-recursive:make_room_for_directories - work around dumb compilers | Junio C Hamano | 2010-10-21 |
| * | | | merge-recursive: Remove redundant path clearing for D/F conflicts | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Make room for directories in D/F conflicts | Elijah Newren | 2010-09-29 |
| * | | | handle_delete_modify(): Check whether D/F conflicts are still present | Elijah Newren | 2010-09-29 |
| * | | | merge_content(): Check whether D/F conflicts are still present | Elijah Newren | 2010-09-29 |
| * | | | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts | Elijah Newren | 2010-09-29 |
| * | | | conflict_rename_delete(): Check whether D/F conflicts are still present | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Delay modify/delete conflicts if D/F conflict present | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Delay content merging for renames | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Delay handling of rename/delete conflicts | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Move handling of double rename of one file to other file | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Move handling of double rename of one file to two | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Avoid doubly merging rename/add conflict contents | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Update merge_content() call signature | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Update conflict_rename_rename_1to2() call signature | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Structure process_df_entry() to handle more cases | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Have process_entry() skip D/F or rename entries | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: New function to assist resolving renames in-core only | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: New data structures for deferring of D/F conflicts | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Move process_entry's content merging into a function | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Move delete/modify handling into dedicated function | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Move rename/delete handling into dedicated function | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Nuke rename/directory conflict detection | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Rename conflict_rename_rename*() for clarity | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Small code clarification -- variable name and comments | Elijah Newren | 2010-09-29 |
| * | | | merge-recursive: Restructure showing how to chain more process_* functions | Junio C Hamano | 2010-09-29 |