summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-01-22Merge branch 'il/branch-set-upstream'Libravatar Junio C Hamano1-0/+21
2010-01-22Merge branch 'jc/maint-limit-note-output'Libravatar Junio C Hamano1-0/+59
2010-01-22git-mv: fix moving more than one source to a single destinationLibravatar Junio C Hamano1-0/+12
2010-01-22rebase -i: Enclose sed command substitution in quotesLibravatar Michael Haggerty1-1/+1
2010-01-21Fix "log --oneline" not to show notesLibravatar Junio C Hamano1-2/+4
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-20Fix "log" family not to be too agressive about showing notesLibravatar Junio C Hamano1-0/+57
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-20Merge branch 'bg/maint-remote-update-default' into maintLibravatar Junio C Hamano1-0/+14
2010-01-20Merge branch 'sb/maint-octopus' into maintLibravatar Junio C Hamano1-0/+51
2010-01-20Merge branch 'maint-1.6.5' into maintLibravatar Junio C Hamano1-0/+6
2010-01-20Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Libravatar Junio C Hamano1-0/+6
2010-01-18Merge branch 'maint-1.6.4' into maint-1.6.5Libravatar Junio C Hamano2-20/+20
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Libravatar Junio C Hamano2-20/+20
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Libravatar Junio C Hamano2-20/+20
2010-01-18Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Libravatar Junio C Hamano1-1/+5
2010-01-18Fix mis-backport of t7002Libravatar Junio C Hamano1-1/+5
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-18Add branch --set-upstreamLibravatar Ilari Liusvaara1-0/+21
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