| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'jc/rename-degrade-cc-to-c' into maint | Junio C Hamano | 2011-05-31 | 1 | -7/+3 |
| |\ |
|
| | * | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 | 1 | -7/+3 |
| * | | add, merge, diff: do not use strcasecmp to compare config variable names | Jonathan Nieder | 2011-05-14 | 1 | -3/+3 |
| * | | Fix two unused variable warnings in gcc 4.6 | Dan McGee | 2011-04-03 | 1 | -4/+0 |
| |/ |
|
| * | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 | 1 | -2/+11 |
| |\ |
|
| | * | merge: enable progress reporting for rename detection | Jeff King | 2011-02-21 | 1 | -0/+1 |
| | * | bump rename limit defaults (again) | Jeff King | 2011-02-21 | 1 | -1/+1 |
| | * | merge: improve inexact rename limit warning | Jeff King | 2011-02-21 | 1 | -1/+9 |
| * | | Merge branch 'maint' | Junio C Hamano | 2011-03-16 | 1 | -8/+4 |
| |\ \ |
|
| | * | | standardize brace placement in struct definitions | Jonathan Nieder | 2011-03-16 | 1 | -8/+4 |
| | |/ |
|
| * | | strbuf: add strbuf_vaddf | Jeff King | 2011-02-26 | 1 | -14/+1 |
| |/ |
|
| * | Merge branch 'en/merge-recursive' | Junio C Hamano | 2010-11-29 | 1 | -223/+429 |
| |\ |
|
| | * | merge-recursive:make_room_for_directories - work around dumb compilers | Junio C Hamano | 2010-10-21 | 1 | -1/+1 |
| | * | merge-recursive: Remove redundant path clearing for D/F conflicts | Elijah Newren | 2010-09-29 | 1 | -15/+2 |
| | * | merge-recursive: Make room for directories in D/F conflicts | Elijah Newren | 2010-09-29 | 1 | -0/+58 |
| | * | handle_delete_modify(): Check whether D/F conflicts are still present | Elijah Newren | 2010-09-29 | 1 | -9/+16 |
| | * | merge_content(): Check whether D/F conflicts are still present | Elijah Newren | 2010-09-29 | 1 | -2/+20 |
| | * | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts | Elijah Newren | 2010-09-29 | 1 | -4/+3 |
| | * | conflict_rename_delete(): Check whether D/F conflicts are still present | Elijah Newren | 2010-09-29 | 1 | -0/+8 |
| | * | merge-recursive: Delay modify/delete conflicts if D/F conflict present | Elijah Newren | 2010-09-29 | 1 | -0/+9 |
| | * | merge-recursive: Delay content merging for renames | Elijah Newren | 2010-09-29 | 1 | -36/+15 |
| | * | merge-recursive: Delay handling of rename/delete conflicts | Elijah Newren | 2010-09-29 | 1 | -2/+20 |
| | * | merge-recursive: Move handling of double rename of one file to other file | Elijah Newren | 2010-09-29 | 1 | -26/+6 |
| | * | merge-recursive: Move handling of double rename of one file to two | Elijah Newren | 2010-09-29 | 1 | -16/+41 |
| | * | merge-recursive: Avoid doubly merging rename/add conflict contents | Elijah Newren | 2010-09-29 | 1 | -0/+1 |
| | * | merge-recursive: Update merge_content() call signature | Elijah Newren | 2010-09-29 | 1 | -2/+4 |
| | * | merge-recursive: Update conflict_rename_rename_1to2() call signature | Elijah Newren | 2010-09-29 | 1 | -9/+9 |
| | * | merge-recursive: Structure process_df_entry() to handle more cases | Elijah Newren | 2010-09-29 | 1 | -36/+47 |
| | * | merge-recursive: Have process_entry() skip D/F or rename entries | Elijah Newren | 2010-09-29 | 1 | -0/+3 |
| | * | merge-recursive: New function to assist resolving renames in-core only | Elijah Newren | 2010-09-29 | 1 | -3/+30 |
| | * | merge-recursive: New data structures for deferring of D/F conflicts | Elijah Newren | 2010-09-29 | 1 | -0/+44 |
| | * | merge-recursive: Move process_entry's content merging into a function | Elijah Newren | 2010-09-29 | 1 | -28/+43 |
| | * | merge-recursive: Move delete/modify handling into dedicated function | Elijah Newren | 2010-09-29 | 1 | -13/+22 |
| | * | merge-recursive: Move rename/delete handling into dedicated function | Elijah Newren | 2010-09-29 | 1 | -11/+20 |
| | * | merge-recursive: Nuke rename/directory conflict detection | Elijah Newren | 2010-09-29 | 1 | -18/+0 |
| | * | merge-recursive: Rename conflict_rename_rename*() for clarity | Elijah Newren | 2010-09-29 | 1 | -12/+14 |
| | * | merge-recursive: Small code clarification -- variable name and comments | Elijah Newren | 2010-09-29 | 1 | -6/+14 |
| | * | merge-recursive: Restructure showing how to chain more process_* functions | Junio C Hamano | 2010-09-29 | 1 | -3/+8 |
| | * | Merge branch 'en/rename-d-f' into en/merge-recursive | Junio C Hamano | 2010-09-29 | 1 | -8/+8 |
| | |\ |
|
| | | * | merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir | Elijah Newren | 2010-09-09 | 1 | -8/+8 |
| * | | | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 2010-10-26 | 1 | -0/+6 |
| |\ \ \ |
|
| | * | | | merge-recursive: option to specify rename threshold | Kevin Ballard | 2010-09-29 | 1 | -0/+6 |
| * | | | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 | 1 | -11/+41 |
| |\ \ \ \
| |/ / /
| | / /
| |/ /
|/| | |
|
| | * | | merge-recursive: options to ignore whitespace changes | Justin Frankel | 2010-08-27 | 1 | -0/+6 |
| | * | | merge-recursive --patience | Justin Frankel | 2010-08-26 | 1 | -0/+3 |
| | * | | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 | 1 | -11/+11 |
| | * | | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 2010-08-26 | 1 | -0/+21 |
| * | | | Merge branch 'ks/recursive-rename-add-identical' | Junio C Hamano | 2010-09-15 | 1 | -0/+6 |
| |\ \ \
| |_|/
|/| | |
|
| | * | | RE: [PATCH] Avoid rename/add conflict when contents are identical | Schalk, Ken | 2010-09-03 | 1 | -0/+6 |
| * | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 | 1 | -45/+1 |
| |\ \ \ |
|
