summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-01-21Make 'rerere forget' work from a subdirectory.Libravatar Johannes Sixt1-22/+49
2010-01-21Make test case numbers uniqueLibravatar Johannes Sixt2-0/+0
2010-01-20conflict-marker-size: add test and docsLibravatar Junio C Hamano1-0/+12
2010-01-20Merge branch 'ag/patch-header-verify'Libravatar Junio C Hamano1-0/+38
2010-01-20Merge branch 'ag/maint-apply-too-large-p'Libravatar Junio C Hamano1-0/+5
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano2-1/+110
2010-01-20Merge branch 'jh/notes' (early part)Libravatar Junio C Hamano3-13/+766
2010-01-20Merge branch 'jc/cache-unmerge'Libravatar Junio C Hamano1-0/+143
2010-01-20Merge branch 'js/exec-error-report'Libravatar Junio C Hamano1-0/+14
2010-01-20Merge branch 'jc/ls-files-ignored-pathspec'Libravatar Junio C Hamano1-0/+39
2010-01-20Merge branch 'jc/grep-lookahead'Libravatar Junio C Hamano1-23/+51
2010-01-20Merge branch 'mm/conflict-advice'Libravatar Junio C Hamano2-3/+5
2010-01-20Merge branch 'da/difftool'Libravatar Junio C Hamano1-12/+51
2010-01-20Merge branch 'mh/rebase-fixup'Libravatar Junio C Hamano2-31/+76
2010-01-20Merge branch 'ns/rebase-auto-squash'Libravatar Junio C Hamano1-0/+73
2010-01-20Merge branch 'mh/rebase-fixup' (early part)Libravatar Junio C Hamano2-53/+94
2010-01-20Merge branch 'il/push-set-upstream'Libravatar Junio C Hamano1-0/+69
2010-01-20Merge branch 'jk/warn-author-committer-after-commit'Libravatar Junio C Hamano2-1/+12
2010-01-20Merge branch 'tr/http-push-ref-status'Libravatar Junio C Hamano1-0/+44
2010-01-20Merge branch 'bk/fix-relative-gitdir-file'Libravatar Junio C Hamano1-0/+38
2010-01-18Merge branch 'jc/rerere'Libravatar Junio C Hamano1-0/+15
2010-01-18Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Libravatar Junio C Hamano1-0/+9
2010-01-18builtin-apply.c: fix the --- and +++ header filename consistency checkLibravatar Andreas Gruenbacher1-0/+38
2010-01-18builtin-apply.c: Skip filenames without enough componentsLibravatar Andreas Gruenbacher1-0/+5
2010-01-17Extend merge-subtree tests to test -Xsubtree=dir.Libravatar Avery Pennarun1-1/+46
2010-01-17Teach git-pull to pass -X<option> to git-mergeLibravatar Avery Pennarun1-0/+8
2010-01-17git merge -X<option>Libravatar Avery Pennarun1-0/+56
2010-01-17Merge branch 'tc/test-locate-httpd'Libravatar Junio C Hamano1-6/+24
2010-01-17Merge branch 'jh/commit-status'Libravatar Junio C Hamano1-0/+109
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Libravatar Junio C Hamano1-0/+57
2010-01-17Merge branch 'tc/clone-v-progress'Libravatar Junio C Hamano1-1/+2
2010-01-17Merge branch 'tc/smart-http-restrict'Libravatar Junio C Hamano5-260/+349
2010-01-17Merge branch 'jk/run-command-use-shell'Libravatar Junio C Hamano3-3/+4
2010-01-17Merge branch 'sr/gfi-options'Libravatar Junio C Hamano1-0/+152
2010-01-16Merge branch 'cc/reset-more'Libravatar Junio C Hamano1-10/+10
2010-01-16Add push --set-upstreamLibravatar Ilari Liusvaara1-0/+69
2010-01-16t7111: fix bad HEAD in tests with unmerged entriesLibravatar Christian Couder1-10/+10
2010-01-15difftool: Update copyright notices to list each year separatelyLibravatar David Aguilar1-1/+1
2010-01-15Test t5560: Fix test when run with dashLibravatar Tarmigan Casebolt1-5/+10
2010-01-15difftool: Use eval to expand '--extcmd' expressionsLibravatar David Aguilar1-0/+13
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'Libravatar David Aguilar1-0/+8
2010-01-15t7800-difftool.sh: Simplify the --extcmd testLibravatar David Aguilar1-8/+5
2010-01-15grep --no-index: allow use of "git grep" outside a git repositoryLibravatar Junio C Hamano1-0/+52
2010-01-14commit: show interesting ident information in summaryLibravatar Jeff King1-1/+5
2010-01-14strbuf_expand: convert "%%" to "%"Libravatar Jeff King1-0/+7
2010-01-14rebase -i: Retain user-edited commit messages after squash/fixup conflictsLibravatar Michael Haggerty1-0/+36
2010-01-14t3404: Set up more of the test repo in the "setup" stepLibravatar Michael Haggerty1-25/+26
2010-01-14rebase -i: For fixup commands without squashes, do not start editorLibravatar Michael Haggerty1-4/+3
2010-01-14rebase -i: Improve consistency of commit count in generated commit messagesLibravatar Michael Haggerty1-2/+2
2010-01-14t3404: Test the commit count in commit messages generated by "rebase -i"Libravatar Michael Haggerty2-3/+12