summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-01-03Use warning function instead of fprintf(stderr, "Warning: ...").Libravatar Thiago Farina1-1/+1
2010-01-03"reset --merge": fix unmerged caseLibravatar Junio C Hamano1-9/+31
2010-01-03reset: use "unpack_trees()" directly instead of "git read-tree"Libravatar Stephan Beyer1-5/+7
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolLibravatar David Aguilar1-0/+12
2010-01-03t7800-difftool: Set a bogus tool for use by testsLibravatar David Aguilar1-1/+2
2009-12-31Merge branch 'maint'Libravatar Junio C Hamano1-13/+13
2009-12-31Merge branch 'maint-1.6.0' into maintLibravatar Junio C Hamano1-13/+13
2009-12-31branch: die explicitly why when calling "git branch [-a|-r] branchname".Libravatar Matthieu Moy1-13/+13
2009-12-31Fix "git remote update" with remotes.defalt setLibravatar Björn Gustavsson1-0/+14
2009-12-31builtin-config: add --path option doing ~ and ~user expansion.Libravatar Matthieu Moy1-0/+28
2009-12-30builtin-push: add --delete as syntactic sugar for :fooLibravatar Jan Krüger1-0/+26
2009-12-30Merge branch 'maint'Libravatar Junio C Hamano1-7/+7
2009-12-30branch -d: base the "already-merged" safety on the branch it merges withLibravatar Junio C Hamano1-0/+26
2009-12-30Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano1-7/+7
2009-12-30reset: add a few tests for "git reset --merge"Libravatar Christian Couder1-0/+159
2009-12-30reset: unbreak hard resets with GIT_WORK_TREELibravatar Jeff King1-0/+6
2009-12-29Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-7/+7
2009-12-29t7102: make the test fail if one of its check failsLibravatar Nguyễn Thái Ngọc Duy1-7/+7
2009-12-28clone: use --progress to force progress reportingLibravatar Tay Ray Chuan1-1/+2
2009-12-27Merge branch 'jk/1.7.0-status'Libravatar Junio C Hamano6-53/+351
2009-12-26Merge branch 'maint'Libravatar Junio C Hamano2-29/+29
2009-12-26Merge branch 'gb/1.7.0-diff-whitespace-only-output'Libravatar Junio C Hamano1-2/+12
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Libravatar Junio C Hamano1-0/+63
2009-12-26Merge branch 'jc/1.7.0-push-safety'Libravatar Junio C Hamano7-17/+25
2009-12-26Merge branch 'sr/vcs-helper'Libravatar Junio C Hamano1-2/+12
2009-12-26t4019 "grep" portability fixLibravatar Junio C Hamano1-28/+28
2009-12-26t1200: work around a bug in some implementations of "find"Libravatar Junio C Hamano1-1/+1
2009-12-25resolve-undo: teach "update-index --unresolve" to use resolve-undo infoLibravatar Junio C Hamano1-0/+7
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationLibravatar Junio C Hamano1-0/+11
2009-12-25resolve-undo: allow plumbing to clear the informationLibravatar Junio C Hamano1-0/+12
2009-12-25resolve-undo: basic testsLibravatar Junio C Hamano1-0/+88
2009-12-23git svn: add test for a git svn gc followed by a git svn mkdirsLibravatar Robert Zeh1-0/+40
2009-12-22Merge branch 'maint'Libravatar Junio C Hamano1-0/+13
2009-12-22Prevent git blame from segfaulting on a missing author nameLibravatar David Reiss1-0/+13
2009-12-21git-svn: detect cherry-picks correctly.Libravatar Sam Vilain1-2/+2
2009-12-21git-svn: fix some mistakes with interpreting SVN mergeinfo commit rangesLibravatar Sam Vilain1-1/+1
2009-12-21git-svn: expand the svn mergeinfo test suite, highlighting some failuresLibravatar Sam Vilain3-172/+860
2009-12-19t9146: use 'svn_cmd' wrapperLibravatar Eric Wong1-1/+1
2009-12-19git svn: make empty directory creation gc-awareLibravatar Eric Wong1-0/+24
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Libravatar Junio C Hamano2-0/+32
2009-12-16worktree: don't segfault with an absolute pathspec without a work treeLibravatar Junio C Hamano1-0/+15
2009-12-16ignore unknown color configurationLibravatar Jeff King1-0/+17
2009-12-14commit: correctly respect skip-worktree bitLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2009-12-13octopus: reenable fast-forward mergesLibravatar Stephen Boyd1-0/+18
2009-12-13octopus: make merge process simpler to followLibravatar Stephen Boyd1-0/+33
2009-12-12status/commit: do not suggest "reset HEAD <path>" while mergingLibravatar Junio C Hamano1-1/+0
2009-12-12commit/status: "git add <path>" is not necessarily how to resolveLibravatar Junio C Hamano1-1/+1
2009-12-10Sync with 1.6.5.6Libravatar Junio C Hamano1-69/+0
2009-12-10Remove post-upload-hookLibravatar Junio C Hamano1-69/+0
2009-12-08Merge branch 'maint'Libravatar Junio C Hamano1-0/+20