summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2011-05-16Merge branch 'jc/maint-branch-mergeoptions' into maintLibravatar Junio C Hamano1-0/+32
2011-05-16Merge branch 'jc/maint-add-p-overlapping-hunks' into maintLibravatar Junio C Hamano1-0/+36
2011-05-15Merge branch 'jm/mergetool-submodules' into maintLibravatar Junio C Hamano1-3/+287
2011-05-15Merge branch 'jk/format-patch-quote-special-in-from' into maintLibravatar Junio C Hamano1-0/+42
2011-05-13Merge branch 'aw/maint-rebase-i-p-no-ff' into maintLibravatar Junio C Hamano1-1/+31
2011-05-13Merge branch 'js/blame-parsename' into maintLibravatar Junio C Hamano2-2/+13
2011-05-13Merge branch 'jk/merge-one-file-working-tree' into maintLibravatar Junio C Hamano1-0/+100
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintLibravatar Junio C Hamano13-22/+102
2011-05-13Merge branch 'mz/maint-rename-unmerged' into maintLibravatar Junio C Hamano1-0/+62
2011-05-13t5400: Fix a couple of typosLibravatar Johan Herland1-2/+2
2011-05-08t3701: add-p-fix makes the last test to passLibravatar Junio C Hamano1-1/+1
2011-05-06merge: make branch.<name>.mergeoptions correctly override merge.<option>Libravatar Junio C Hamano1-0/+32
2011-05-05t3701: fix here documentLibravatar Junio C Hamano1-3/+2
2011-05-05t/annotate-tests: Use echo & cat instead of sedLibravatar Brian Gernhardt1-1/+2
2011-05-04Merge branch 'jh/dirstat' into maintLibravatar Junio C Hamano6-7/+40
2011-05-04Merge branch 'jk/maint-stash-oob' into maintLibravatar Junio C Hamano1-5/+11
2011-05-04Merge branch 'dm/stash-k-i-p' into maintLibravatar Junio C Hamano2-0/+20
2011-05-04Merge branch 'mg/reflog-with-options' into maintLibravatar Junio C Hamano1-0/+18
2011-05-04Merge branch 'jk/stash-loosen-safety' into maintLibravatar Junio C Hamano1-4/+16
2011-05-04Merge branch 'ar/clean-rmdir-empty' into maintLibravatar Junio C Hamano1-0/+7
2011-05-04Merge branch 'mg/sha1-path-advise' into maintLibravatar Junio C Hamano1-5/+12
2011-04-29merge-one-file: fix broken merges with alternate work treesLibravatar Jeff King1-2/+2
2011-04-29add tests for merge-index / merge-one-fileLibravatar Jeff King1-0/+100
2011-04-29t3701: Editing a split hunk in an "add -p" sessionLibravatar Junio C Hamano1-0/+36
2011-04-29Merge branch 'mg/x-years-12-months' into maintLibravatar Junio C Hamano1-0/+1
2011-04-29blame: tolerate bogus e-mail addresses a bit betterLibravatar Josh Stone2-2/+12
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffLibravatar Andrew Wong1-1/+31
2011-04-26pretty: quote rfc822 specials in email addressesLibravatar Jeff King1-0/+42
2011-04-23diff-files: show unmerged entries correctlyLibravatar Junio C Hamano1-0/+87
2011-04-23test: use $_z40 from test-libLibravatar Junio C Hamano12-22/+15
2011-04-20date: avoid "X years, 12 months" in relative datesLibravatar Michael J Gruber1-0/+1
2011-04-14Merge branch 'maint'Libravatar Junio C Hamano2-1/+5
2011-04-14t3306,t5304: avoid clock skew issuesLibravatar Michael J Gruber2-1/+5
2011-04-13Merge branch 'js/checkout-untracked-symlink' into maintLibravatar Junio C Hamano1-1/+1
2011-04-13mergetool: Teach about submodulesLibravatar Jonathon Mah1-3/+287
2011-04-12Merge branch 'js/checkout-untracked-symlink'Libravatar Junio C Hamano1-1/+1
2011-04-12Merge branch 'nd/init-gitdir'Libravatar Junio C Hamano1-1/+1
2011-04-12t2021: mark a test as fixedLibravatar Johannes Sixt1-1/+1
2011-04-11t0001: guard a new test with SYMLINKS prerequisiteLibravatar Johannes Sixt1-1/+1
2011-04-11Teach --dirstat not to completely ignore rearranged lines within a fileLibravatar Johan Herland2-2/+1
2011-04-11--dirstat-by-file: Make it faster and more correctLibravatar Johan Herland2-0/+5
2011-04-11--dirstat: Describe non-obvious differences relative to --stat or regular diffLibravatar Johan Herland5-7/+36
2011-04-07stash: ensure --no-keep-index and --patch can be used in any orderLibravatar Dan McGee1-1/+1
2011-04-07stash: add two more tests for --no-keep-indexLibravatar Dan McGee2-0/+20
2011-04-06Merge branch 'nm/maint-conflicted-submodule-entries' into maintLibravatar Junio C Hamano1-6/+52
2011-04-06Merge branch 'jk/maint-remote-mirror-safer'Libravatar Junio C Hamano1-0/+78
2011-04-06stash: drop dirty worktree check on applyLibravatar Jeff King1-4/+16
2011-04-05stash: fix false positive in the invalid ref test.Libravatar Jon Seymour1-5/+5
2011-04-05stash: fix accidental apply of non-existent stashesLibravatar Jeff King1-0/+6
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Libravatar Junio C Hamano3-1/+276
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 20:47:16 +0000