summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-039-562/+701
|\
| * merge script: learn --[no-]rerere-autoupdateJonathan Nieder2010-08-181-2/+5
| * merge script: notice @{-1} shorthandJonathan Nieder2010-08-181-2/+4
| * merge script: handle --no-ff --no-commit correctlyJonathan Nieder2010-08-181-2/+10
| * merge script: --ff-only to disallow true mergeJonathan Nieder2010-08-181-2/+15
| * merge script: handle many-way octopusJonathan Nieder2010-08-181-3/+3
| * merge script: handle -m --log correctlyJonathan Nieder2010-08-181-4/+10
| * merge script: forbid merge -s indexJonathan Nieder2010-08-181-0/+5
| * merge script: allow custom strategiesJonathan Nieder2010-08-181-2/+6
| * merge script: merge -X<option>Jonathan Nieder2010-08-181-1/+7
| * merge script: improve log message subjectJonathan Nieder2010-08-181-8/+19
| * merge script: refuse to merge during mergeJonathan Nieder2010-08-181-0/+3
| * merge script: tweak unmerged files message to match builtinJonathan Nieder2010-08-181-1/+1
| * merge script: --squash, --ff from unborn branch are errorsJonathan Nieder2010-08-181-0/+4
| * fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-183-4/+55
| * merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-183-7/+62
| * merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-183-10/+46
| * Documentation: add a SEE ALSO section for merge-baseJonathan Nieder2010-08-181-0/+6
| * 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-182-5/+13
* | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-0318-170/+785
|\ \
| * | merge-recursive --renormalizeJonathan Nieder2010-08-068-8/+45
| * | rerere: never renormalizeJonathan Nieder2010-08-061-6/+5
| * | rerere: migrate to parse-options APIJonathan Nieder2010-08-062-24/+119
| * | t4200 (rerere): modernize styleJonathan Nieder2010-08-061-125/+180
| * | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-065-8/+19
| * | ll-merge: make flag easier to populateJonathan Nieder2010-08-064-9/+28
| * | Documentation/technical: document ll_mergeJonathan Nieder2010-08-061-0/+70
| * | merge-trees: let caller decide whether to renormalizeJonathan Nieder2010-08-062-1/+3
| * | merge-trees: push choice to renormalize away from low levelJonathan Nieder2010-08-061-4/+5
| * | 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
| * | Don't expand CRLFs when normalizing text during mergeEyvind Bernhardsen2010-07-021-7/+20
| * | Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-022-3/+50
| * | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-028-2/+143
* | | Sync with 1.7.2.3Junio C Hamano2010-09-033-9/+6
|\ \ \
| * | | Git 1.7.2.3v1.7.2.3Junio C Hamano2010-09-033-9/+3
| * | | builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina2010-09-031-1/+4
* | | | 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
* | | | Prepare for 1.7.3Junio C Hamano2010-09-012-1/+74
* | | | Merge branch 'maint'Junio C Hamano2010-09-012-1/+47
|\ \ \ \ | |/ / /
| * | | Prepare for 1.7.2.3Junio C Hamano2010-09-012-1/+47
| * | | Merge branch 'gp/pack-refs-remove-empty-dirs' into maintJunio C Hamano2010-09-012-0/+38
| |\ \ \
View Lorry Controller Status