summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsLibravatar Johannes Schindelin1-0/+22
2006-12-28git-svn: remove non-delta fetch code pathsLibravatar Eric Wong1-2/+1
2006-12-28t9200-git-cvsexportcommit.sh: quiet down commitLibravatar Eric Wong1-4/+6
2006-12-28test-lib: quiet down init-db output for testsLibravatar Eric Wong1-1/+1
2006-12-28t6024-recursive-merge: quiet down this testLibravatar Eric Wong1-43/+47
2006-12-27Rename t3900 test vector fileLibravatar Junio C Hamano2-5/+5
2006-12-27UTF-8: introduce i18n.logoutputencoding.Libravatar Junio C Hamano6-0/+122
2006-12-27Merge branch 'master' into js/shallowLibravatar Junio C Hamano28-245/+1030
2006-12-26git-svn: quiet down tests and fix some unportable shell constructsLibravatar Eric Wong1-131/+127
2006-12-25t3600: update the test for updated git rmLibravatar Junio C Hamano1-4/+74
2006-12-25Merge branch 'jc/skip-count'Libravatar Junio C Hamano1-0/+51
2006-12-24Merge branch 'sb/merge-friendly'Libravatar Junio C Hamano1-3/+3
2006-12-23Display 'theirs' branch name when possible in merge.Libravatar Shawn O. Pearce1-3/+3
2006-12-21Add a test for git-rerereLibravatar Johannes Schindelin1-0/+154
2006-12-20Merge branch 'ew/svn-pm'Libravatar Junio C Hamano8-51/+25
2006-12-20revision: --skip=<n>Libravatar Junio C Hamano1-0/+51
2006-12-19Do not create $GIT_DIR/remotes/ directory anymore.Libravatar Junio C Hamano1-4/+3
2006-12-19Introduce GIT_TEMPLATE_DIRLibravatar Johannes Schindelin1-1/+2
2006-12-19Revert "fix testsuite: make sure they use templates freshly built from the so...Libravatar Junio C Hamano11-36/+26
2006-12-18fix testsuite: make sure they use templates freshly built from the sourceLibravatar Junio C Hamano11-26/+36
2006-12-17Merge branch 'js/branch-config'Libravatar Junio C Hamano2-0/+54
2006-12-17Fix check_file_directory_conflict().Libravatar Junio C Hamano1-0/+9
2006-12-16git-branch: rename config vars branch.<branch>.*, tooLibravatar Johannes Schindelin1-0/+6
2006-12-16add a function to rename sections in the configLibravatar Johannes Schindelin1-0/+48
2006-12-16git-svn: rename 'commit' command to 'set-tree'Libravatar Eric Wong3-13/+13
2006-12-16git-svn: remove support for the svn command-line clientLibravatar Eric Wong6-38/+12
2006-12-15Add --add option to git-repo-configLibravatar Brian Gernhardt1-0/+10
2006-12-15Enable reflogs by default in any repository with a working directory.Libravatar Shawn O. Pearce1-2/+2
2006-12-15make commit message a little more consistent and confortingLibravatar Nicolas Pitre1-2/+0
2006-12-13Merge branch 'jc/read-tree-ignore'Libravatar Junio C Hamano1-8/+74
2006-12-13Merge branch 'lh/branch-rename'Libravatar Junio C Hamano1-0/+41
2006-12-13Merge branch 'rr/cvsexportcommit'Libravatar Junio C Hamano1-28/+80
2006-12-13Merge branch 'js/merge'Libravatar Junio C Hamano3-14/+128
2006-12-13Remove uncontested renamed files during merge.Libravatar Shawn Pearce1-0/+97
2006-12-12merge-recursive: add/add really is modify/modify with an empty baseLibravatar Johannes Schindelin1-1/+11
2006-12-12Merge branch 'master' into js/mergeLibravatar Junio C Hamano4-4/+101
2006-12-12Get rid of the dependency on RCS' merge programLibravatar Johannes Schindelin1-13/+1
2006-12-12add test case for recursive mergeLibravatar Junio C Hamano1-0/+70
2006-12-11Make cvsexportcommit work with filenames with spaces and non-ascii characters.Libravatar Robin Rosenberg1-28/+80
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeLibravatar Johannes Schindelin1-0/+116
2006-12-05rename_ref: use lstat(2) when testing for symlinkLibravatar Lars Hjemli1-0/+7
2006-12-05git-branch: add options and tests for branch renamingLibravatar Lars Hjemli1-0/+34
2006-12-05read-tree: further loosen "working file will be lost" check.Libravatar Junio C Hamano1-8/+74
2006-12-04diff -b: ignore whitespace at end of lineLibravatar Johannes Schindelin1-4/+2
2006-12-04Merge branch 'maint'Libravatar Junio C Hamano1-0/+13
2006-12-04Set permissions of each new file before "cvs add"ing it.Libravatar Jim Meyering1-0/+16
2006-12-04git-mv: search more precisely for source directory in indexLibravatar Johannes Schindelin1-0/+13
2006-11-27git-svn: update tests for recent changesLibravatar Eric Wong4-2/+10
2006-11-26Merge branch 'jc/push-delete-ref'Libravatar Junio C Hamano1-0/+10
2006-11-26Merge branch 'jc/merge'Libravatar Junio C Hamano3-27/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 19:27:26 +0000