summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-01-21Make test case numbers uniqueLibravatar Johannes Sixt2-0/+0
2010-01-20conflict-marker-size: add test and docsLibravatar Junio C Hamano2-0/+29
2010-01-20Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+45
2010-01-20Merge branch 'bw/cvsimport'Libravatar Junio C Hamano1-35/+35
2010-01-20Merge branch 'jc/checkout-merge-base'Libravatar Junio C Hamano1-2/+4
2010-01-20Merge branch 'ag/patch-header-verify'Libravatar Junio C Hamano2-1/+39
2010-01-20Merge branch 'jc/conflict-marker-size'Libravatar Junio C Hamano16-78/+155
2010-01-20Merge branch 'ag/maint-apply-too-large-p'Libravatar Junio C Hamano2-2/+14
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano21-54/+392
2010-01-20Merge branch 'nd/status-partial-refresh'Libravatar Junio C Hamano3-3/+4
2010-01-20Merge remote branch 'remotes/trast-doc/for-next'Libravatar Junio C Hamano116-685/+693
2010-01-20Merge branch 'jh/notes' (early part)Libravatar Junio C Hamano4-18/+895
2010-01-20Merge branch 'maint'Libravatar Junio C Hamano0-0/+0
2010-01-20Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maintLibravatar Junio C Hamano1-4/+6
2010-01-20Fix memory corruption when .gitignore does not end by \nLibravatar Nguyễn Thái Ngọc Duy1-3/+13
2010-01-20Fix "log" family not to be too agressive about showing notesLibravatar Junio C Hamano8-1/+82
2010-01-20Merge branch 'rr/core-tutorial'Libravatar Junio C Hamano1-0/+8
2010-01-20Merge branch 'jc/cache-unmerge'Libravatar Junio C Hamano14-47/+652
2010-01-20Merge branch 'js/exec-error-report'Libravatar Junio C Hamano5-50/+191
2010-01-20Merge branch 'jc/ls-files-ignored-pathspec'Libravatar Junio C Hamano2-64/+174
2010-01-20Merge branch 'jc/grep-lookahead'Libravatar Junio C Hamano7-370/+166
2010-01-20Merge branch 'jc/maint-strbuf-add-fix-doubling'Libravatar Junio C Hamano1-0/+1
2010-01-20Merge branch 'mm/conflict-advice'Libravatar Junio C Hamano9-13/+93
2010-01-20Merge branch 'da/difftool'Libravatar Junio C Hamano5-27/+118
2010-01-20Merge branch 'mh/rebase-fixup'Libravatar Junio C Hamano3-112/+219
2010-01-20Merge branch 'ns/rebase-auto-squash'Libravatar Junio C Hamano3-0/+120
2010-01-20Merge branch 'mh/rebase-fixup' (early part)Libravatar Junio C Hamano4-68/+137
2010-01-20Merge branch 'il/push-set-upstream'Libravatar Junio C Hamano5-1/+136
2010-01-20Merge branch 'jk/warn-author-committer-after-commit'Libravatar Junio C Hamano11-5/+88
2010-01-20Merge branch 'jc/ident'Libravatar Junio C Hamano4-13/+24
2010-01-20Merge branch 'tr/http-push-ref-status'Libravatar Junio C Hamano6-49/+137
2010-01-20Merge branch 'bk/fix-relative-gitdir-file'Libravatar Junio C Hamano2-3/+57
2010-01-20Merge branch 'sd/cd-p-show-toplevel'Libravatar Junio C Hamano3-14/+14
2010-01-20Merge branch 'jc/symbol-static'Libravatar Junio C Hamano30-142/+34
2010-01-20date.c: mark file-local function staticLibravatar Junio C Hamano2-2/+1
2010-01-20Sync with 1.6.6.1Libravatar Junio C Hamano3-8/+45
2010-01-20Git 1.6.6.1Libravatar Junio C Hamano3-8/+16
2010-01-20Merge branch 'bg/maint-remote-update-default' into maintLibravatar Junio C Hamano2-6/+18
2010-01-20Merge branch 'sb/maint-octopus' into maintLibravatar Junio C Hamano2-9/+57
2010-01-20Merge branch 'bg/maint-add-all-doc' into maintLibravatar Junio C Hamano2-29/+88
2010-01-20Merge branch 'maint-1.6.5' into maintLibravatar Junio C Hamano5-9/+40
2010-01-20Git 1.6.5.8Libravatar Junio C Hamano4-3/+32
2010-01-20rev-parse --branches/--tags/--remotes=patternLibravatar Ilari Liusvaara9-20/+139
2010-01-20rev-parse --globLibravatar Ilari Liusvaara9-2/+223
2010-01-20Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Libravatar Junio C Hamano2-4/+8
2010-01-20Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1...Libravatar Junio C Hamano1-4/+2
2010-01-20Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5Libravatar Junio C Hamano1-5/+5
2010-01-20Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5Libravatar Junio C Hamano1-0/+1
2010-01-20Teach @{upstream} syntax to strbuf_branchanme()Libravatar Junio C Hamano2-45/+77
2010-01-20t1506: more test for @{upstream} syntaxLibravatar Junio C Hamano1-0/+41