summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)Author
2010-12-08Merge branch 'jk/pager-per-command'Junio C Hamano
2010-12-08Merge branch 'jk/maint-decorate-01-bool'Junio C Hamano
2010-12-08Merge branch 'gc/http-with-non-ascii-username-url'Junio C Hamano
2010-12-08Merge branch 'mg/maint-tag-rfc1991'Junio C Hamano
2010-12-08Merge branch 'jh/notes-merge'Junio C Hamano
2010-12-04Merge branch 'pn/commit-autosquash'Junio C Hamano
2010-11-30Merge branch 'cb/leading-path-removal'Junio C Hamano
2010-11-30Merge branch 'en/merge-recursive'Junio C Hamano
2010-11-30Merge branch 'jn/cherry-pick-refresh-index'Junio C Hamano
2010-11-30Merge branch 'fc/apply-p2-get-header-name'Junio C Hamano
2010-11-30Merge branch 'jn/fast-import-fix'Junio C Hamano
2010-11-30Merge branch 'kb/blame-author-email'Junio C Hamano
2010-11-30Merge branch 'cm/diff-check-at-eol'Junio C Hamano
2010-11-30Merge branch 'ak/apply-non-git-epoch'Junio C Hamano
2010-11-30Merge branch 'tc/smart-http-post-redirect'Junio C Hamano
2010-11-26Merge branch 'en/and-cascade-tests'Junio C Hamano
2010-11-26t7300: add a missing SYMLINKS prerequisiteJohannes Sixt
2010-11-24Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano
2010-11-24Merge branch 'ao/send-email-irt'Junio C Hamano
2010-11-24Merge branch 'kb/maint-rebase-autosquash'Junio C Hamano
2010-11-24Merge branch 'mm/phrase-remote-tracking'Junio C Hamano
2010-11-24Merge branch 'en/and-cascade-tests'Junio C Hamano
2010-11-17Merge branch 'kb/maint-submodule-savearg'Junio C Hamano
2010-11-17Merge branch 'jk/missing-config'Junio C Hamano
2010-11-17Merge branch 'kb/maint-diff-ws-check'Junio C Hamano
2010-11-17Merge branch 'bg/maint-gitweb-test-lib'Junio C Hamano
2010-11-17Merge branch 'jm/mailmap'Junio C Hamano
2010-11-17Merge branch 'jk/maint-apply-no-binary'Junio C Hamano
2010-11-17Merge branch 'jk/push-progress'Junio C Hamano
2010-11-17Merge branch 'tr/maint-merge-file-subdir'Junio C Hamano
2010-11-17Merge branch 'mg/make-prove'Junio C Hamano
2010-11-17Merge branch 'ak/submodule-sync'Junio C Hamano
2010-11-17Merge branch 'jk/maint-rev-list-nul'Junio C Hamano
2010-11-17Merge branch 'ks/no-textconv-symlink'Junio C Hamano
2010-11-17Merge branch 'jn/gitweb-test'Junio C Hamano
2010-11-17Merge branch 'cb/diff-fname-optim'Junio C Hamano
2010-11-17Merge branch 'jk/no-textconv-symlink'Junio C Hamano
2010-11-17Merge branch 'maint'Junio C Hamano
2010-11-17t6022: Use -eq not = to test output of wc -lBrian Gernhardt
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland
2010-11-17Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland
2010-11-17git notes merge: Add testcases for merging notes trees at different fanoutsJohan Herland
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedJohan Herland
2010-11-17git notes merge: List conflicting notes in notes merge commit messageJohan Herland
2010-11-17git notes merge: Manual conflict resolution, part 2/2Johan Herland
2010-11-17git notes merge: Manual conflict resolution, part 1/2Johan Herland
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland
2010-11-17git notes merge: Handle real, non-conflicting notes mergesJohan Herland
2010-11-17git notes merge: Initial implementation handling trivial merges onlyJohan Herland