summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/apply-filename-with-sp'Junio C Hamano2010-09-0320-3/+245
|\
| * apply: handle traditional patches with space in filenameJonathan Nieder2010-08-211-2/+2
| * tests: exercise "git apply" with weird filenamesJonathan Nieder2010-08-2119-0/+213
| * apply: split quoted filename handling into new functionJonathan Nieder2010-08-211-3/+32
* | Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano2010-09-031-26/+70
|\ \
| * | t7606: Avoid using head as a file nameBrian Gernhardt2010-08-241-4/+4
| * | merge: let custom strategies intervene in trivial mergesJonathan Nieder2010-08-151-3/+33
| * | t7606 (merge-theirs): modernize styleJonathan Nieder2010-08-151-26/+40
| |/
* | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-033-522/+519
|\ \
| * | fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-181-0/+32
| * | merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-181-1/+38
| * | merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-181-0/+2
| * | t6200 (fmt-merge-msg): style nitpicksJonathan Nieder2010-08-181-160/+120
| * | t6010 (merge-base): modernize styleJonathan Nieder2010-08-181-143/+160
| * | t7600 (merge): test merge from branch yet to be bornJonathan Nieder2010-08-181-0/+21
| * | t7600 (merge): check reflog entryJonathan Nieder2010-08-181-1/+7
| * | t7600 (merge): do not launch gitk for --debugJonathan Nieder2010-08-181-29/+29
| * | t7600 (merge): modernize styleJonathan Nieder2010-08-181-187/+101
| * | merge: do not mistake (ancestor of) tag for branchJonathan Nieder2010-08-181-4/+12
| |/
* | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-032-131/+466
|\ \
| * | rerere: migrate to parse-options APIJonathan Nieder2010-08-061-0/+91
| * | t4200 (rerere): modernize styleJonathan Nieder2010-08-061-125/+180
| * | t6038 (merge.renormalize): check that it can be turned offJonathan Nieder2010-08-061-1/+49
| * | t6038 (merge.renormalize): try checkout -m and cherry-pickJonathan Nieder2010-08-061-0/+41
| * | t6038 (merge.renormalize): style nitpicksJonathan Nieder2010-08-061-8/+44
| * | Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-021-1/+1
| * | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+64
* | | t7406 & t7407: add missing && at end of linesJens Lehmann2010-09-032-3/+3
* | | t7405: cd inside subshell instead of aroundJens Lehmann2010-09-031-11/+6
* | | Merge branch 'da/fix-submodule-sync-superproject-config'Junio C Hamano2010-08-311-0/+3
|\ \ \
| * | | submodule sync: Update "submodule.<name>.url"David Aguilar2010-08-181-0/+3
| | |/ | |/|
* | | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-312-5/+79
|\ \ \
| * | | tests: fix syntax error in "Use advise() for hints" testÆvar Arnfjörð Bjarmason2010-08-181-5/+5
| * | | cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-151-0/+20
| * | | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-151-12/+30
| * | | t3508: add check_head_differs_from() helper function and use itChristian Couder2010-07-231-5/+17
| * | | revert: improve success message by adding abbreviated commit sha1Christian Couder2010-07-161-8/+8
| * | | revert: report success when using option --strategyChristian Couder2010-07-161-1/+25
* | | | Merge branch 'dj/fetch-tagopt'Junio C Hamano2010-08-311-0/+41
|\ \ \ \
| * | | | fetch: allow command line --tags to override configDaniel Johnson2010-08-141-0/+41
| | |/ / | |/| |
* | | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-315-5/+151
|\ \ \ \
| * | | | merge-recursive: Fix multiple file rename across D/F conflictElijah Newren2010-08-181-1/+1
| * | | | t6031: Add a testcase covering multiple renames across a D/F conflictElijah Newren2010-08-181-0/+31
| * | | | Mark tests that use symlinks as needing SYMLINKS prerequisiteElijah Newren2010-08-122-3/+3
| * | | | t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing testÆvar Arnfjörð Bjarmason2010-07-271-1/+1
| * | | | fast-export: Fix output order of D/F changesElijah Newren2010-07-091-1/+1
| * | | | merge_recursive: Fix renames across paths below D/F conflictsElijah Newren2010-07-092-2/+2
| * | | | merge-recursive: Fix D/F conflictsElijah Newren2010-07-091-3/+3
| * | | | Add a rename + D/F conflict testcaseAlexander Gladysh2010-07-091-0/+35
| * | | | Add additional testcases for D/F conflictsElijah Newren2010-07-092-4/+84
View Lorry Controller Status