summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)Author
2006-12-17Fix check_file_directory_conflict().Junio C Hamano
2006-12-16Add --add option to git-repo-configBrian Gernhardt
2006-12-16Enable reflogs by default in any repository with a working directory.Shawn O. Pearce
2006-12-16make commit message a little more consistent and confortingNicolas Pitre
2006-12-13Merge branch 'jc/read-tree-ignore'Junio C Hamano
2006-12-13Merge branch 'lh/branch-rename'Junio C Hamano
2006-12-13Merge branch 'rr/cvsexportcommit'Junio C Hamano
2006-12-13Merge branch 'js/merge'Junio C Hamano
2006-12-13Remove uncontested renamed files during merge.Shawn Pearce
2006-12-13merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin
2006-12-13Merge branch 'master' into js/mergeJunio C Hamano
2006-12-13Get rid of the dependency on RCS' merge programJohannes Schindelin
2006-12-13add test case for recursive mergeJunio C Hamano
2006-12-11Make cvsexportcommit work with filenames with spaces and non-ascii characters.Robin Rosenberg
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin
2006-12-06rename_ref: use lstat(2) when testing for symlinkLars Hjemli
2006-12-06git-branch: add options and tests for branch renamingLars Hjemli
2006-12-06read-tree: further loosen "working file will be lost" check.Junio C Hamano
2006-12-05diff -b: ignore whitespace at end of lineJohannes Schindelin
2006-12-05Merge branch 'maint'Junio C Hamano
2006-12-04Set permissions of each new file before "cvs add"ing it.Jim Meyering
2006-12-04git-mv: search more precisely for source directory in indexJohannes Schindelin
2006-11-28git-svn: update tests for recent changesEric Wong
2006-11-27Merge branch 'jc/push-delete-ref'Junio C Hamano
2006-11-27Merge branch 'jc/merge'Junio C Hamano
2006-11-24Allow git push to delete remote ref.Junio C Hamano
2006-11-24config option log.showroot to show the diff of root commitsPeter Baumann
2006-11-23trust-executable-bit: fix breakage for symlinksJunio C Hamano
2006-11-22remove merge-recursive-oldJunio C Hamano
2006-11-20git-fetch: follow lightweit tags as well.Junio C Hamano
2006-11-17git-pull: allow pulling into an empty repositoryLinus Torvalds
2006-11-13Merge branch 'maint'Junio C Hamano
2006-11-13Rework cvsexportcommit to handle binary files for all cases.Robin Rosenberg
2006-11-13Catch errors when writing an index that contains invalid objects.Johannes Sixt
2006-11-13test-lib.sh: A command dying due to a signal is an unexpected failure.Johannes Sixt
2006-11-09Merge branch 'maint'Junio C Hamano
2006-11-09git-svn: fix dcommit losing changes when out-of-date from svnEric Wong
2006-11-09git-pickaxe: retire pickaxeJunio C Hamano
2006-11-08Merge branch 'jc/pickaxe'Junio C Hamano
2006-11-07Merge branch 'jc/read-tree'Junio C Hamano
2006-11-01Merge branch 'lj/refs'Junio C Hamano
2006-10-28t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano
2006-10-28merge: loosen overcautious "working file will be lost" check.Junio C Hamano
2006-10-27tests: merge-recursive is usable without PythonJunio C Hamano
2006-10-25Merge branch 'maint'Junio C Hamano
2006-10-24Set $HOME for selftestsGerrit Pape
2006-10-24t3200: git-branch testsuite updateJunio C Hamano
2006-10-20git-pickaxe: blame rewritten.Junio C Hamano
2006-10-20Merge branch 'maint'Junio C Hamano
2006-10-20git-apply: prepare for upcoming GNU diff -u format change.Linus Torvalds