aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* merge-recursive: options to ignore whitespace changesJustin Frankel2010-08-27
* rerere: migrate to parse-options APIJonathan Nieder2010-08-06
* t4200 (rerere): modernize styleJonathan Nieder2010-08-06
* t6038 (merge.renormalize): check that it can be turned offJonathan Nieder2010-08-06
* t6038 (merge.renormalize): try checkout -m and cherry-pickJonathan Nieder2010-08-06
* t6038 (merge.renormalize): style nitpicksJonathan Nieder2010-08-06
* Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-02
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-02
* Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-27
|\
| * t/t8007: test textconv support for cat-fileClément Poulain2010-06-18
* | Merge branch 'tr/send-email-8bit'Junio C Hamano2010-06-27
|\ \
| * | send-email: ask about and declare 8bit mailsThomas Rast2010-06-18
* | | Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2010-06-27
|\ \ \
| * | | am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-16
| |/ /
* | | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-27
|\ \ \ | | |/ | |/|
| * | t/t8006: test textconv support for blameAxel Bonnet2010-06-18
* | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-22
|\ \ \
| * | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-16
* | | | Merge branch 'mg/pretty-magic-space'Junio C Hamano2010-06-22
|\ \ \ \
| * | | | pretty: Introduce ' ' modifier to add space if non-emptyMichael J Gruber2010-06-16
| |/ / /
* | | | Merge branch 'cc/cherry-pick-series'Junio C Hamano2010-06-22
|\ \ \ \
| * | | | revert: add tests to check cherry-picking many commitsChristian Couder2010-06-02
| | |/ / | |/| |
* | | | Merge branch 'jc/rev-list-ancestry-path'Junio C Hamano2010-06-22
|\ \ \ \
| * | | | revision: Turn off history simplification in --ancestry-path modeJohan Herland2010-06-06
| * | | | revision: --ancestry-pathJunio C Hamano2010-04-21
* | | | | Merge branch 'maint'Junio C Hamano2010-06-22
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ic/maint-rebase-i-abort' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tests: remove unnecessary '^' from 'expr' regular expressionJunio C Hamano2010-06-21
| * | | | | | | | | | | | | | | Merge branch 'cb/assume-unchanged-fix' into maintJunio C Hamano2010-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/notes-doc' into maintJunio C Hamano2010-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/test-cleanup' into maintJunio C Hamano2010-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/apply-blank-trailing-context' into maintJunio C Hamano2010-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-stash-orphaned-file' into maintJunio C Hamano2010-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/advice-statushints' into maintJunio C Hamano2010-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-bundle' into maintJunio C Hamano2010-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/t7006-fixup' into maintJunio C Hamano2010-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/shortlog' into maintJunio C Hamano2010-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-dumb-http-pack-reidx' into maintJunio C Hamano2010-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maintJunio C Hamano2010-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rc/maint-curl-helper' into maintJunio C Hamano2010-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hg/maint-attr-fix' into maintJunio C Hamano2010-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \