aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* notes remove: allow removing more than oneJunio C Hamano2011-05-19
* Merge branch 'ci/commit--interactive-atomic'Junio C Hamano2011-05-16
|\
| * Test atomic git-commit --interactiveConrad Irwin2011-05-10
| * Allow git commit --interactive with pathsConrad Irwin2011-05-09
| * t7501.8: feed a meaningful commandJeff King2011-05-09
* | Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-16
|\ \
| * | tests: check git does not barf on merge.ff values for future versions of gitJonathan Nieder2011-05-06
| * | merge: introduce merge.ff configuration variableJunio C Hamano2011-05-06
| * | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-06
| |\ \ | | |/ | |/|
* | | Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-13
|\ \ \
| * | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-11
* | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha'Junio C Hamano2011-05-13
|\ \ \ \
| * | | | t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-09
* | | | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-13
|\ \ \ \ \
| * | | | | Mark dirstat error messages for translationJohan Herland2011-04-29
| * | | | | Improve error handling when parsing dirstat parametersJohan Herland2011-04-29
| * | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-29
| * | | | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-29
| * | | | | Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-29
| * | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland2011-04-29
| * | | | | Make --dirstat=0 output directories that contribute < 0.1% of changesJohan Herland2011-04-29
| * | | | | Add several testcases for --dirstat and friendsJohan Herland2011-04-29
* | | | | | Merge branch 'jc/fix-add-u-unmerged'Junio C Hamano2011-05-13
|\ \ \ \ \ \
| * | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-23
* | | | | | | Merge branch 'jn/setup-revisions-glob-and-friends-passthru'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \
| * | | | | | | revisions: allow --glob and friends in parse_options-enabled commandsJonathan Nieder2011-04-21
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2011-05-13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano2011-05-13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-13
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2011-05-13
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5400: Fix a couple of typosJohan Herland2011-05-13
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tweak t3102-ls-tree-wildcards to run on WindowsJohannes Sixt2011-05-12
* | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-06
* | | | | | | | | | | | Merge branch 'jn/maint-test-merge-verify-parents'Junio C Hamano2011-05-11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tests: teach verify_parents to check for extra parentsJonathan Nieder2011-05-06
| * | | | | | | | | | | | tests: eliminate unnecessary setup test assertionsJonathan Nieder2011-05-06
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks'Junio C Hamano2011-05-11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t3701: add-p-fix makes the last test to passJunio C Hamano2011-05-08
| * | | | | | | | | | | | t3701: Editing a split hunk in an "add -p" sessionJunio C Hamano2011-04-29
* | | | | | | | | | | | | Merge branch 'dm/http-cleanup'Junio C Hamano2011-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t5541-http-push: add test for chunkedTay Ray Chuan2011-05-04
* | | | | | | | | | | | | | Merge branch 'jn/ctags'Junio C Hamano2011-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gitweb: Restructure projects list generationJakub Narebski2011-04-29
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jn/run-command-error-failure'Junio C Hamano2011-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | tests: check error message from run_commandJonathan Nieder2011-04-20
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/merge-one-file-working-tree'Junio C Hamano2011-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |