summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-04-17Merge branch 'maint'Libravatar Junio C Hamano2-6/+12
2010-04-17t6006: do not write to /tmpLibravatar Matthew Ogilvie1-1/+1
2010-04-17t1010-mktree: Adjust expected result to code and documentationLibravatar Michael J Gruber1-6/+4
2010-04-17combined diff: correctly handle truncated fileLibravatar Thomas Rast1-0/+8
2010-04-11t3507: Make test executableLibravatar Stephen Boyd1-0/+0
2010-04-10Merge branch 'jl/maint-submodule-gitfile-awareness'Libravatar Junio C Hamano2-0/+31
2010-04-10Teach diff --submodule and status to handle .git files in submodulesLibravatar Jens Lehmann2-0/+31
2010-04-09Merge branch 'ef/maint-empty-commit-log' into maintLibravatar Junio C Hamano1-0/+9
2010-04-09Merge branch 'jc/conflict-marker-size' into maintLibravatar Junio C Hamano1-1/+22
2010-04-07Merge branch 'mg/notes-reflog'Libravatar Junio C Hamano1-0/+9
2010-04-06Merge branch 'sb/fmt-merge-msg'Libravatar Junio C Hamano1-34/+162
2010-04-06Merge branch 'jc/conflict-marker-size'Libravatar Junio C Hamano1-1/+22
2010-04-06Merge branch 'ef/maint-empty-commit-log'Libravatar Junio C Hamano1-0/+9
2010-04-03Merge branch 'mb/rebase-i-no-ff'Libravatar Junio C Hamano1-4/+32
2010-04-03Merge branch 'jn/merge-diff3-label'Libravatar Junio C Hamano3-8/+263
2010-04-03Merge branch 'bc/t5505-fix'Libravatar Junio C Hamano1-41/+6
2010-04-03Merge branch 'bc/acl-test'Libravatar Junio C Hamano1-17/+6
2010-04-03Merge branch 'do/rebase-i-arbitrary'Libravatar Junio C Hamano1-0/+9
2010-03-31Merge branch 'jc/maint-refs-dangling' into maintLibravatar Junio C Hamano1-3/+3
2010-03-29Merge branch 'maint'Libravatar Junio C Hamano1-0/+4
2010-03-29format-patch: Squelch 'fatal: Not a range." errorLibravatar Kevin Ballard1-0/+4
2010-03-29refs.c: Write reflogs for notes just like for branch headsLibravatar Michael J Gruber1-1/+1
2010-03-29t3301-notes: Test the creation of reflog entriesLibravatar Michael J Gruber1-0/+9
2010-03-28Merge branch 'cc/cherry-pick-ff'Libravatar Junio C Hamano1-0/+98
2010-03-28Merge branch 'sb/notes-parse-opt'Libravatar Junio C Hamano1-0/+11
2010-03-28rebase -i: make post-rewrite work for 'edit'Libravatar Thomas Rast1-0/+16
2010-03-28Merge branch 'cp/add-u-pathspec' into maintLibravatar Junio C Hamano2-0/+10
2010-03-28Merge branch 'maint'Libravatar Junio C Hamano2-33/+47
2010-03-28t9350: fix careless use of "cd"Libravatar Junio C Hamano1-33/+38
2010-03-28difftool: Fix '--gui' when diff.guitool is unconfiguredLibravatar David Aguilar1-0/+9
2010-03-24t6200: test fmt-merge-msg moreLibravatar Stephen Boyd1-0/+115
2010-03-24t6200: modernize with test_tickLibravatar Stephen Boyd1-35/+29
2010-03-24fmt-merge-msg: be quiet if nothing to mergeLibravatar Stephen Boyd1-0/+19
2010-03-24diff --check: honor conflict-marker-size attributeLibravatar Junio C Hamano1-1/+22
2010-03-24Merge branch 'tr/notes-display'Libravatar Junio C Hamano6-8/+609
2010-03-24Merge branch 'jl/submodule-diff-dirtiness'Libravatar Junio C Hamano2-9/+97
2010-03-24Merge branch 'pb/log-first-parent-p-m'Libravatar Junio C Hamano7-0/+543
2010-03-24Merge branch 'jc/maint-refs-dangling'Libravatar Junio C Hamano1-3/+3
2010-03-24Merge branch 'jc/color-attrs' into maintLibravatar Junio C Hamano1-4/+11
2010-03-24Merge branch 'jk/maint-add-ignored-dir' into maintLibravatar Junio C Hamano2-2/+85
2010-03-24Merge branch 'bg/apply-fix-blank-at-eof' into maintLibravatar Junio C Hamano3-0/+305
2010-03-24Teach rebase the --no-ff option.Libravatar Marc Branchaud1-4/+32
2010-03-21rev-list: fix --pretty=oneline with empty messageLibravatar Erik Faye-Lund1-0/+9
2010-03-20cherry-pick, revert: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
2010-03-20revert: clarify label on conflict hunksLibravatar Jonathan Nieder1-2/+2
2010-03-20checkout -m --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-1/+1
2010-03-20checkout --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
2010-03-20merge-file --diff3: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
2010-03-20tests: document cherry-pick behavior in face of conflictsLibravatar Jonathan Nieder1-0/+198
2010-03-20tests: document format of conflicts from checkout -mLibravatar Jonathan Nieder1-4/+61
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 01:38:51 +0000