summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Add --add option to git-repo-configBrian Gernhardt2006-12-151-0/+10
* Enable reflogs by default in any repository with a working directory.Shawn O. Pearce2006-12-151-2/+2
* make commit message a little more consistent and confortingNicolas Pitre2006-12-151-2/+0
* Merge branch 'jc/read-tree-ignore'Junio C Hamano2006-12-131-8/+74
|\
| * read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-051-8/+74
* | Merge branch 'lh/branch-rename'Junio C Hamano2006-12-131-0/+41
|\ \
| * | rename_ref: use lstat(2) when testing for symlinkLars Hjemli2006-12-051-0/+7
| * | git-branch: add options and tests for branch renamingLars Hjemli2006-12-051-0/+34
| |/
* | Merge branch 'rr/cvsexportcommit'Junio C Hamano2006-12-131-28/+80
|\ \
| * | Make cvsexportcommit work with filenames with spaces and non-ascii characters.Robin Rosenberg2006-12-111-28/+80
| |/
* | Merge branch 'js/merge'Junio C Hamano2006-12-133-14/+128
|\ \
| * | merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-121-1/+11
| * | Merge branch 'master' into js/mergeJunio C Hamano2006-12-124-4/+101
| |\ \
| * | | Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-121-13/+1
| * | | Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-061-0/+116
* | | | Remove uncontested renamed files during merge.Shawn Pearce2006-12-131-0/+97
| |/ / |/| |
* | | add test case for recursive mergeJunio C Hamano2006-12-121-0/+70
| |/ |/|
* | diff -b: ignore whitespace at end of lineJohannes Schindelin2006-12-041-4/+2
* | Merge branch 'maint'Junio C Hamano2006-12-041-0/+13
|\ \
| * | git-mv: search more precisely for source directory in indexJohannes Schindelin2006-12-041-0/+13
* | | Set permissions of each new file before "cvs add"ing it.Jim Meyering2006-12-041-0/+16
| |/ |/|
* | git-svn: update tests for recent changesEric Wong2006-11-274-2/+10
* | Merge branch 'jc/push-delete-ref'Junio C Hamano2006-11-261-0/+10
|\ \
| * | Allow git push to delete remote ref.Junio C Hamano2006-11-241-0/+10
* | | Merge branch 'jc/merge'Junio C Hamano2006-11-263-27/+6
|\ \ \ | |/ / |/| |
| * | remove merge-recursive-oldJunio C Hamano2006-11-213-27/+6
* | | config option log.showroot to show the diff of root commitsPeter Baumann2006-11-241-0/+1
| |/ |/|
* | trust-executable-bit: fix breakage for symlinksJunio C Hamano2006-11-221-2/+12
|/
* git-fetch: follow lightweit tags as well.Junio C Hamano2006-11-191-0/+16
* git-pull: allow pulling into an empty repositoryLinus Torvalds2006-11-161-0/+33
* Merge branch 'maint'Junio C Hamano2006-11-135-1/+168
|\
| * Rework cvsexportcommit to handle binary files for all cases.Robin Rosenberg2006-11-133-0/+145
| * Catch errors when writing an index that contains invalid objects.Johannes Sixt2006-11-131-0/+22
| * test-lib.sh: A command dying due to a signal is an unexpected failure.Johannes Sixt2006-11-131-1/+1
* | Merge branch 'maint'Junio C Hamano2006-11-092-1/+75
|\ \ | |/
| * git-svn: fix dcommit losing changes when out-of-date from svnEric Wong2006-11-092-1/+75
* | git-pickaxe: retire pickaxeJunio C Hamano2006-11-081-9/+0
* | Merge branch 'jc/pickaxe'Junio C Hamano2006-11-072-0/+10
|\ \
| * | git-pickaxe: blame rewritten.Junio C Hamano2006-10-192-0/+10
* | | Merge branch 'jc/read-tree'Junio C Hamano2006-11-072-23/+195
|\ \ \
| * | | t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano2006-10-271-23/+142
| * | | merge: loosen overcautious "working file will be lost" check.Junio C Hamano2006-10-271-0/+53
* | | | Merge branch 'lj/refs'Junio C Hamano2006-11-013-11/+104
|\ \ \ \ | |/ / / |/| | |
| * | | t3200: git-branch testsuite updateJunio C Hamano2006-10-231-6/+3
| * | | ref-log: fix D/F conflict coming from deleted refs.Junio C Hamano2006-10-191-0/+2
| * | | git-pack-refs --allJunio C Hamano2006-10-081-8/+8
| * | | Remove bashism from t3210-pack-refs.shDennis Stosberg2006-10-061-1/+1
| * | | Merge branch 'master' into lj/refsJunio C Hamano2006-10-022-0/+21
| |\ \ \
| * | | | Clean up "git-branch.sh" and add remove recursive dir test cases.Christian Couder2006-10-011-0/+27
| * | | | Uncomment test case: git branch c/d should barf if branch c exists.Christian Couder2006-09-271-6/+6