summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: Move handling of double rename of one file to twoElijah Newren2010-09-292-17/+42
* merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren2010-09-292-2/+3
* merge-recursive: Update merge_content() call signatureElijah Newren2010-09-291-2/+4
* merge-recursive: Update conflict_rename_rename_1to2() call signatureElijah Newren2010-09-291-9/+9
* merge-recursive: Structure process_df_entry() to handle more casesElijah Newren2010-09-291-36/+47
* merge-recursive: Have process_entry() skip D/F or rename entriesElijah Newren2010-09-291-0/+3
* merge-recursive: New function to assist resolving renames in-core onlyElijah Newren2010-09-291-3/+30
* merge-recursive: New data structures for deferring of D/F conflictsElijah Newren2010-09-291-0/+44
* merge-recursive: Move process_entry's content merging into a functionElijah Newren2010-09-291-28/+43
* merge-recursive: Move delete/modify handling into dedicated functionElijah Newren2010-09-291-13/+22
* merge-recursive: Move rename/delete handling into dedicated functionElijah Newren2010-09-291-11/+20
* merge-recursive: Nuke rename/directory conflict detectionElijah Newren2010-09-291-18/+0
* merge-recursive: Rename conflict_rename_rename*() for clarityElijah Newren2010-09-291-12/+14
* merge-recursive: Small code clarification -- variable name and commentsElijah Newren2010-09-291-6/+14
* t6036: Add testcase for undetected conflictElijah Newren2010-09-291-0/+85
* t6036: Add a second testcase similar to the first but with content changesElijah Newren2010-09-291-0/+76
* t6036: Test index and worktree state, not just that merge failsElijah Newren2010-09-291-3/+21
* t6020: Add a testcase for modify/delete + directory/file conflictElijah Newren2010-09-291-0/+47
* t6020: Modernize style a bitElijah Newren2010-09-291-15/+20
* t6022: Add tests for rename/rename combined with D/F conflictsElijah Newren2010-09-291-0/+79
* t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Elijah Newren2010-09-291-0/+63
* t6022: Add tests with both rename source & dest involved in D/F conflictsElijah Newren2010-09-291-0/+38
* t6022: Add tests for reversing order of merges when D/F conflicts presentElijah Newren2010-09-291-0/+58
* t6022: Add test combinations of {content conflict?, D/F conflict remains?}Elijah Newren2010-09-291-0/+128
* t6032: Add a test checking for excessive output from mergeElijah Newren2010-09-291-0/+30
* merge-recursive: Restructure showing how to chain more process_* functionsJunio C Hamano2010-09-291-3/+8
* t3030: Add a testcase for resolvable rename/add conflict with symlinksSchalk, Ken2010-09-291-1/+36
* Merge branch 'en/rename-d-f' into en/merge-recursiveJunio C Hamano2010-09-292-8/+74
|\
| * merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren2010-09-092-10/+10
| * t3509: Add rename + D/F conflict testcase that recursive strategy failsElijah Newren2010-09-091-0/+66
* | Git 1.7.3v1.7.3Junio C Hamano2010-09-183-14/+8
* | Merge branch 'js/ls-files-x-doc'Junio C Hamano2010-09-181-5/+6
|\ \
| * | ls-files documentation: reword for consistencyJunio C Hamano2010-09-151-4/+4
| * | git-ls-files.txt: clarify -x/--exclude optionJay Soffian2010-09-151-2/+3
* | | git-rebase--interactive.sh: replace cut with ${v%% *}Chris Johnsen2010-09-171-1/+1
* | | t/t7300: workaround ancient touch by rearranging argumentsBrandon Casey2010-09-171-1/+1
* | | Merge branch 'bg/fix-t7003'Junio C Hamano2010-09-161-38/+41
|\ \ \
| * | | t7003: Use test_commit instead of custom functionBrian Gernhardt2010-09-131-38/+41
* | | | Git 1.7.3 rc2v1.7.3-rc2Junio C Hamano2010-09-152-3/+9
* | | | Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Junio C Hamano2010-09-152-0/+11
|\ \ \ \
| * | | | ls-tree $di $dir: do not mistakenly recurse into directoriesJunio C Hamano2010-09-122-0/+11
* | | | | Merge branch 'os/fix-rebase-diff-no-prefix'Junio C Hamano2010-09-151-0/+1
|\ \ \ \ \
| * | | | | Add --src/dst-prefix to git-formt-patch in git-rebase.shOded Shimon2010-09-091-0/+1
* | | | | | Merge branch 'jl/fix-test'Junio C Hamano2010-09-1535-491/+604
|\ \ \ \ \ \
| * | | | | | t1020: Get rid of 'cd "$HERE"' at the start of each testJens Lehmann2010-09-091-41/+50
| * | | | | | t2016 (checkout -p): add missing &&Jonathan Nieder2010-09-091-1/+1
| * | | | | | t1302 (core.repositoryversion): style tweaksJonathan Nieder2010-09-091-24/+40
| * | | | | | t2105 (gitfile): add missing &&Jonathan Nieder2010-09-091-1/+1
| * | | | | | t1450 (fsck): remove dangling objectsJonathan Nieder2010-09-091-58/+82
| * | | | | | tests: subshell indentation stylefixJonathan Nieder2010-09-0922-192/+260
View Lorry Controller Status