summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* combine-diff: respect textconv attributesJeff King2011-05-241-0/+99
* combine-diff: handle binary files as binaryJeff King2011-05-231-0/+113
* Merge branch 'maint'Junio C Hamano2011-05-201-0/+15
|\
| * git-svn: Fix git svn log --show-commitMichael J Gruber2011-05-201-0/+15
| * Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintJunio C Hamano2011-05-161-2/+5
| |\
| * \ Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-161-17/+7
| |\ \
| * \ \ Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-161-0/+32
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-161-0/+36
| |\ \ \ \
* | \ \ \ \ Merge branch 'jl/submodule-conflicted-gitmodules'Junio C Hamano2011-05-191-4/+88
|\ \ \ \ \ \
| * | | | | | Submodules: Don't parse .gitmodules when it contains, merge conflictsJens Lehmann2011-05-141-3/+3
| * | | | | | test that git status works with merge conflict in, .gitmodulesHeiko Voigt2011-05-141-4/+88
* | | | | | | Merge branch 'jc/replacing'Junio C Hamano2011-05-191-2/+16
|\ \ \ \ \ \ \
| * | | | | | | t6050: make sure we test not just commit replacementJunio C Hamano2011-05-151-2/+16
* | | | | | | | Merge branch 'nd/sparse-co-fix'Junio C Hamano2011-05-191-4/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | sparse checkout: do not eagerly decide the fate for whole directoryNguyễn Thái Ngọc Duy2011-05-101-0/+41
| * | | | | | | | t1011: fix sparse-checkout initialization and add new fileNguyễn Thái Ngọc Duy2011-05-101-4/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'ld/p4-preserve-user-names'Junio C Hamano2011-05-191-0/+125
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: warn if git authorship won't be retainedLuke Diamand2011-05-131-0/+41
| * | | | | | | | git-p4: add option to preserve user namesLuke Diamand2011-04-261-0/+84
* | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix'Junio C Hamano2011-05-191-0/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test core.gitproxy configurationJeff King2011-05-181-0/+43
* | | | | | | | | | Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano2011-05-191-2/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3503: test cherry picking and reverting root commitsJeff King2011-05-161-2/+25
| | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2011-05-151-3/+287
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2011-05-151-0/+42
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/maint-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-191-0/+17
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-111-0/+17
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-111-0/+17
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | setup_revisions(): take pathspec from command line and --stdin correctlyJunio C Hamano2011-05-111-0/+17
* | | | | | | | | | | | | | Revert "Merge branch 'en/merge-recursive'"Junio C Hamano2011-05-191-63/+0
* | | | | | | | | | | | | | Merge branch 'ci/commit--interactive-atomic'Junio C Hamano2011-05-161-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Test atomic git-commit --interactiveConrad Irwin2011-05-101-0/+10
| * | | | | | | | | | | | | | Allow git commit --interactive with pathsConrad Irwin2011-05-091-2/+3
| * | | | | | | | | | | | | | t7501.8: feed a meaningful commandJeff King2011-05-091-4/+6
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-161-6/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | tests: check git does not barf on merge.ff values for future versions of gitJonathan Nieder2011-05-061-2/+14
| * | | | | | | | | | | | | | merge: introduce merge.ff configuration variableJunio C Hamano2011-05-061-2/+41
| * | | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-061-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | / / / | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-132-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-112-0/+22
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha'Junio C Hamano2011-05-131-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-091-2/+5
* | | | | | | | | | | | | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-131-0/+979
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Mark dirstat error messages for translationJohan Herland2011-04-291-11/+11
| * | | | | | | | | | | | | | Improve error handling when parsing dirstat parametersJohan Herland2011-04-291-0/+37
| * | | | | | | | | | | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-291-0/+100
| * | | | | | | | | | | | | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-291-0/+64
| * | | | | | | | | | | | | | Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-291-0/+72
| * | | | | | | | | | | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland2011-04-291-1/+122
| * | | | | | | | | | | | | | Make --dirstat=0 output directories that contribute < 0.1% of changesJohan Herland2011-04-291-2/+2
View Lorry Controller Status