summaryrefslogtreecommitdiffstats
path: root/tree.c (unfollow)
Commit message (Expand)AuthorFilesLines
2010-09-30merge-recursive: Update conflict_rename_rename_1to2() call signatureElijah Newren1-9/+9
2010-09-30merge-recursive: Structure process_df_entry() to handle more casesElijah Newren1-36/+47
2010-09-30merge-recursive: Have process_entry() skip D/F or rename entriesElijah Newren1-0/+3
2010-09-30merge-recursive: New function to assist resolving renames in-core onlyElijah Newren1-3/+30
2010-09-30merge-recursive: New data structures for deferring of D/F conflictsElijah Newren1-0/+44
2010-09-30merge-recursive: Move process_entry's content merging into a functionElijah Newren1-28/+43
2010-09-30merge-recursive: Move delete/modify handling into dedicated functionElijah Newren1-13/+22
2010-09-30merge-recursive: Move rename/delete handling into dedicated functionElijah Newren1-11/+20
2010-09-30merge-recursive: Nuke rename/directory conflict detectionElijah Newren1-18/+0
2010-09-30merge-recursive: Rename conflict_rename_rename*() for clarityElijah Newren1-12/+14
2010-09-30merge-recursive: Small code clarification -- variable name and commentsElijah Newren1-6/+14
2010-09-30t6036: Add testcase for undetected conflictElijah Newren1-0/+85
2010-09-30t6036: Add a second testcase similar to the first but with content changesElijah Newren1-0/+76
2010-09-30t6036: Test index and worktree state, not just that merge failsElijah Newren1-3/+21
2010-09-30t6020: Add a testcase for modify/delete + directory/file conflictElijah Newren1-0/+47
2010-09-30t6020: Modernize style a bitElijah Newren1-15/+20
2010-09-30t6022: Add tests for rename/rename combined with D/F conflictsElijah Newren1-0/+79
2010-09-30t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Elijah Newren1-0/+63
2010-09-30t6022: Add tests with both rename source & dest involved in D/F conflictsElijah Newren1-0/+38
2010-09-30t6022: Add tests for reversing order of merges when D/F conflicts presentElijah Newren1-0/+58
2010-09-30t6022: Add test combinations of {content conflict?, D/F conflict remains?}Elijah Newren1-0/+128
2010-09-30t6032: Add a test checking for excessive output from mergeElijah Newren1-0/+30
2010-09-30merge-recursive: Restructure showing how to chain more process_* functionsJunio C Hamano1-3/+8
2010-09-30t3030: Add a testcase for resolvable rename/add conflict with symlinksSchalk, Ken1-1/+36
2010-09-18Git 1.7.3v1.7.3Junio C Hamano3-14/+8
2010-09-17git-rebase--interactive.sh: replace cut with ${v%% *}Chris Johnsen1-1/+1
2010-09-17t/t7300: workaround ancient touch by rearranging argumentsBrandon Casey1-1/+1
2010-09-16ls-files documentation: reword for consistencyJunio C Hamano1-4/+4
2010-09-16git-ls-files.txt: clarify -x/--exclude optionJay Soffian1-2/+3
2010-09-15Git 1.7.3 rc2v1.7.3-rc2Junio C Hamano2-3/+9
2010-09-14git-gui 0.13gitgui-0.13.0Pat Thoyts1-1/+1
2010-09-13git-gui: avoid mis-encoding the copyright message on Windows.Pat Thoyts1-2/+2
2010-09-13git-gui: Update Swedish translation (521t).Peter Krefting1-399/+403
2010-09-13t7003: Use test_commit instead of custom functionBrian Gernhardt1-38/+41
2010-09-12ls-tree $di $dir: do not mistakenly recurse into directoriesJunio C Hamano2-0/+11
2010-09-12t3101: modernise styleJunio C Hamano1-62/+64
2010-09-12vcs-svn: Fix some printf format compiler warningsRamsay Jones3-5/+10
2010-09-11compat/nedmalloc: don't force NDEBUG on the rest of gitRené Scharfe1-1/+6
2010-09-10Git 1.7.3 rc1v1.7.3-rc1Junio C Hamano1-1/+1
2010-09-10Prepare for 1.7.3 rc1Junio C Hamano1-2/+10
2010-09-10config.txt: fix placement of diff.noprefixMark Lodato1-2/+3
2010-09-10t/t4018: avoid two unnecessary sub-shell invocationsBrandon Casey1-4/+4
2010-09-10t/t4018: test whether the word_regex patterns compileBrandon Casey1-0/+5
2010-09-10xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey1-3/+2
2010-09-10diff.c: call regfree to free memory allocated by regcomp when necessaryBrandon Casey1-1/+4
2010-09-10t/t5510-fetch.sh: improve testing with explicit URL and merge specBrandon Casey1-2/+28
2010-09-10builtin/fetch.c: comment that branch->remote_name is usable when has_mergeBrandon Casey1-0/+3
2010-09-10Makefile: use compat regex on IRIX 6.5Brandon Casey1-0/+2
2010-09-10t/t7008: workaround broken handling of \000 by printf on IRIXBrandon Casey1-7/+7
2010-09-10Add --src/dst-prefix to git-formt-patch in git-rebase.shOded Shimon1-0/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 19:49:57 +0100