summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
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-06Add builtin merge-file, a minimal replacement for RCS mergeLibravatar Johannes Schindelin1-0/+116
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
2006-11-24Allow git push to delete remote ref.Libravatar Junio C Hamano1-0/+10
2006-11-24config option log.showroot to show the diff of root commitsLibravatar Peter Baumann1-0/+1
2006-11-22trust-executable-bit: fix breakage for symlinksLibravatar Junio C Hamano1-2/+12
2006-11-21remove merge-recursive-oldLibravatar Junio C Hamano3-27/+6
2006-11-19git-fetch: follow lightweit tags as well.Libravatar Junio C Hamano1-0/+16
2006-11-16git-pull: allow pulling into an empty repositoryLibravatar Linus Torvalds1-0/+33
2006-11-13Merge branch 'maint'Libravatar Junio C Hamano5-1/+168
2006-11-13Rework cvsexportcommit to handle binary files for all cases.Libravatar Robin Rosenberg3-0/+145
2006-11-13Catch errors when writing an index that contains invalid objects.Libravatar Johannes Sixt1-0/+22
2006-11-13test-lib.sh: A command dying due to a signal is an unexpected failure.Libravatar Johannes Sixt1-1/+1
2006-11-09Merge branch 'maint'Libravatar Junio C Hamano2-1/+75
2006-11-09git-svn: fix dcommit losing changes when out-of-date from svnLibravatar Eric Wong2-1/+75
2006-11-08git-pickaxe: retire pickaxeLibravatar Junio C Hamano1-9/+0
2006-11-07Merge branch 'jc/pickaxe'Libravatar Junio C Hamano2-0/+10
2006-11-07Merge branch 'jc/read-tree'Libravatar Junio C Hamano2-23/+195
2006-11-01Merge branch 'lj/refs'Libravatar Junio C Hamano3-11/+104
2006-10-27t6022: ignoring untracked files by merge-recursive when they do not matterLibravatar Junio C Hamano1-23/+142
2006-10-27merge: loosen overcautious "working file will be lost" check.Libravatar Junio C Hamano1-0/+53
2006-10-27tests: merge-recursive is usable without PythonLibravatar Junio C Hamano5-28/+1
2006-10-25Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2006-10-24Set $HOME for selftestsLibravatar Gerrit Pape1-1/+2
2006-10-23t3200: git-branch testsuite updateLibravatar Junio C Hamano1-6/+3
2006-10-19git-pickaxe: blame rewritten.Libravatar Junio C Hamano2-0/+10
2006-10-19Merge branch 'maint'Libravatar Junio C Hamano1-0/+55
2006-10-19git-apply: prepare for upcoming GNU diff -u format change.Libravatar Linus Torvalds1-0/+55
2006-10-19ref-log: fix D/F conflict coming from deleted refs.Libravatar Junio C Hamano1-0/+2
2006-10-18Merge branch 'js/diff'Libravatar Junio C Hamano1-1/+1
2006-10-18Merge branch 'rs/zip'Libravatar Junio C Hamano1-0/+35
2006-10-14clone: the given repository dir should be relative to $PWDLibravatar Yasushi SHOJI1-0/+6
2006-10-13t4015: work-around here document problem on Cygwin.Libravatar Junio C Hamano1-6/+6
2006-10-12diff: fix 2 whitespace issuesLibravatar Johannes Schindelin1-0/+122
2006-10-08git-pack-refs --allLibravatar Junio C Hamano1-8/+8
2006-10-07git-archive --format=zip: add symlink supportLibravatar Rene Scharfe1-0/+35
2006-10-07test-lib: separate individual test better in verbose mode.Libravatar Martin Waitz1-0/+3
2006-10-06Remove bashism from t3210-pack-refs.shLibravatar Dennis Stosberg1-1/+1
2006-10-05Turn on recursive with --summaryLibravatar Johannes Schindelin1-1/+1