summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-12-10git-svn: allow the mergeinfo property to be setLibravatar Steven Walter1-0/+41
2010-12-08Merge branch 'jk/pager-per-command'Libravatar Junio C Hamano1-0/+29
2010-12-08Merge branch 'jk/maint-decorate-01-bool'Libravatar Junio C Hamano1-0/+9
2010-12-08Merge branch 'gc/http-with-non-ascii-username-url'Libravatar Junio C Hamano4-0/+40
2010-12-08Merge branch 'mg/maint-tag-rfc1991'Libravatar Junio C Hamano1-0/+66
2010-12-08Merge branch 'jh/notes-merge'Libravatar Junio C Hamano9-9/+2359
2010-12-03Merge branch 'pn/commit-autosquash'Libravatar Junio C Hamano4-2/+140
2010-11-29Merge branch 'cb/leading-path-removal'Libravatar Junio C Hamano2-31/+87
2010-11-29Merge branch 'en/merge-recursive'Libravatar Junio C Hamano6-17/+743
2010-11-29Merge branch 'jn/cherry-pick-refresh-index'Libravatar Junio C Hamano1-0/+10
2010-11-29Merge branch 'fc/apply-p2-get-header-name'Libravatar Junio C Hamano1-0/+26
2010-11-29Merge branch 'jn/fast-import-fix'Libravatar Junio C Hamano1-0/+108
2010-11-29Merge branch 'kb/blame-author-email'Libravatar Junio C Hamano2-6/+11
2010-11-29Merge branch 'cm/diff-check-at-eol'Libravatar Junio C Hamano1-0/+9
2010-11-29Merge branch 'ak/apply-non-git-epoch'Libravatar Junio C Hamano4-0/+28
2010-11-29Merge branch 'tc/smart-http-post-redirect'Libravatar Junio C Hamano2-0/+15
2010-11-26Merge branch 'en/and-cascade-tests'Libravatar Junio C Hamano1-1/+1
2010-11-26t7300: add a missing SYMLINKS prerequisiteLibravatar Johannes Sixt1-1/+1
2010-11-24Merge branch 'cb/maint-orphan-merge-noclobber'Libravatar Junio C Hamano1-0/+16
2010-11-24Merge branch 'ao/send-email-irt'Libravatar Junio C Hamano1-0/+43
2010-11-24Merge branch 'kb/maint-rebase-autosquash'Libravatar Junio C Hamano1-0/+74
2010-11-24Merge branch 'mm/phrase-remote-tracking'Libravatar Junio C Hamano7-26/+28
2010-11-24Merge branch 'en/and-cascade-tests'Libravatar Junio C Hamano114-657/+597
2010-11-17Merge branch 'kb/maint-submodule-savearg'Libravatar Junio C Hamano1-0/+50
2010-11-17Merge branch 'jk/missing-config'Libravatar Junio C Hamano1-0/+29
2010-11-17Merge branch 'kb/maint-diff-ws-check'Libravatar Junio C Hamano3-44/+114
2010-11-17Merge branch 'bg/maint-gitweb-test-lib'Libravatar Junio C Hamano1-1/+1
2010-11-17Merge branch 'jm/mailmap'Libravatar Junio C Hamano1-12/+55
2010-11-17Merge branch 'jk/maint-apply-no-binary'Libravatar Junio C Hamano1-1/+26
2010-11-17Merge branch 'jk/push-progress'Libravatar Junio C Hamano5-51/+107
2010-11-17Merge branch 'tr/maint-merge-file-subdir'Libravatar Junio C Hamano1-0/+8
2010-11-17Merge branch 'mg/make-prove'Libravatar Junio C Hamano2-1/+15
2010-11-17Merge branch 'ak/submodule-sync'Libravatar Junio C Hamano1-1/+11
2010-11-17Merge branch 'jk/maint-rev-list-nul'Libravatar Junio C Hamano3-4/+12
2010-11-17Merge branch 'ks/no-textconv-symlink'Libravatar Junio C Hamano2-12/+88
2010-11-17Merge branch 'jn/gitweb-test'Libravatar Junio C Hamano2-2/+23
2010-11-17Merge branch 'cb/diff-fname-optim'Libravatar Junio C Hamano1-0/+109
2010-11-17Merge branch 'jk/no-textconv-symlink'Libravatar Junio C Hamano1-0/+26
2010-11-17Merge branch 'maint'Libravatar Junio C Hamano1-0/+21
2010-11-17t6022: Use -eq not = to test output of wc -lLibravatar Brian Gernhardt1-32/+32
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Libravatar Johan Herland1-0/+313
2010-11-17Provide 'git notes get-ref' to easily retrieve current notes refLibravatar Johan Herland1-0/+19
2010-11-17git notes merge: Add testcases for merging notes trees at different fanoutsLibravatar Johan Herland1-0/+436
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-0/+145
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedLibravatar Johan Herland1-0/+76
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-0/+12
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-0/+176
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-0/+292
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-0/+502
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-0/+188