Commit message (Expand) | Author | Age | |
---|---|---|---|
*---. | Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming | Junio C Hamano | 2011-05-15 |
|\ \ \ | |||
| | | * | t6050: make sure we test not just commit replacement | Junio C Hamano | 2011-05-15 |
| | |/ | |/| | |||
| | * | Bigfile: teach "git add" to send a large file straight to a pack | Junio C Hamano | 2011-05-13 |
* | | | Merge branch 'bf/commit-template-no-cleanup' | Junio C Hamano | 2011-05-13 |
|\ \ \ | |||
| * | | | Do not strip empty lines / trailing spaces from a commit message template | Boris Faure | 2011-05-11 |
* | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha' | Junio C Hamano | 2011-05-13 |
|\ \ \ \ | |||
| * | | | | t1507: avoid "${parameter<op>'word'}" inside double-quotes | Junio C Hamano | 2011-05-09 |
* | | | | | Merge branch 'jh/dirstat-lines' | Junio C Hamano | 2011-05-13 |
|\ \ \ \ \ | |||
| * | | | | | Mark dirstat error messages for translation | Johan Herland | 2011-04-29 |
| * | | | | | Improve error handling when parsing dirstat parameters | Johan Herland | 2011-04-29 |
| * | | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstat | Johan Herland | 2011-04-29 |
| * | | | | | Allow specifying --dirstat cut-off percentage as a floating point number | Johan Herland | 2011-04-29 |
| * | | | | | Add config variable for specifying default --dirstat behavior | Johan Herland | 2011-04-29 |
| * | | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file | Johan Herland | 2011-04-29 |
| * | | | | | Make --dirstat=0 output directories that contribute < 0.1% of changes | Johan Herland | 2011-04-29 |
| * | | | | | Add several testcases for --dirstat and friends | Johan Herland | 2011-04-29 |
* | | | | | | Merge branch 'jc/fix-add-u-unmerged' | Junio C Hamano | 2011-05-13 |
|\ \ \ \ \ \ | |||
| * | | | | | | Fix "add -u" that sometimes fails to resolve unmerged paths | Junio C Hamano | 2011-04-23 |
* | | | | | | | Merge branch 'jn/setup-revisions-glob-and-friends-passthru' | Junio C Hamano | 2011-05-13 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | revisions: allow --glob and friends in parse_options-enabled commands | Jonathan Nieder | 2011-04-21 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-13 |
|\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'aw/maint-rebase-i-p-no-ff' into maint | Junio C Hamano | 2011-05-13 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/blame-parsename' into maint | Junio C Hamano | 2011-05-13 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/merge-one-file-working-tree' into maint | Junio C Hamano | 2011-05-13 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/fix-diff-files-unmerged' into maint | Junio C Hamano | 2011-05-13 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||
| * | | | | | | | | | | | Merge branch 'mz/maint-rename-unmerged' into maint | Junio C Hamano | 2011-05-13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | t5400: Fix a couple of typos | Johan Herland | 2011-05-13 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Tweak t3102-ls-tree-wildcards to run on Windows | Johannes Sixt | 2011-05-12 |
* | | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' | Junio C Hamano | 2011-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | merge: make branch.<name>.mergeoptions correctly override merge.<option> | Junio C Hamano | 2011-05-06 |
* | | | | | | | | | | | | | | Merge branch 'jn/maint-test-merge-verify-parents' | Junio C Hamano | 2011-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | tests: teach verify_parents to check for extra parents | Jonathan Nieder | 2011-05-06 |
| * | | | | | | | | | | | | | | tests: eliminate unnecessary setup test assertions | Jonathan Nieder | 2011-05-06 |
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' | Junio C Hamano | 2011-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | t3701: add-p-fix makes the last test to pass | Junio C Hamano | 2011-05-08 |
| * | | | | | | | | | | | | | | t3701: Editing a split hunk in an "add -p" session | Junio C Hamano | 2011-04-29 |
* | | | | | | | | | | | | | | | Merge branch 'dm/http-cleanup' | Junio C Hamano | 2011-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | t5541-http-push: add test for chunked | Tay Ray Chuan | 2011-05-04 |
* | | | | | | | | | | | | | | | | Merge branch 'jn/ctags' | Junio C Hamano | 2011-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | gitweb: Restructure projects list generation | Jakub Narebski | 2011-04-29 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'jn/run-command-error-failure' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | tests: check error message from run_command | Jonathan Nieder | 2011-04-20 |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'jk/merge-one-file-working-tree' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | merge-one-file: fix broken merges with alternate work trees | Jeff King | 2011-04-29 |
| * | | | | | | | | | | | | | | add tests for merge-index / merge-one-file | Jeff King | 2011-04-29 |
* | | | | | | | | | | | | | | | Merge branch 'jc/fix-diff-files-unmerged' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | diff-files: show unmerged entries correctly | Junio C Hamano | 2011-04-23 |
| * | | | | | | | | | | | | | | test: use $_z40 from test-lib | Junio C Hamano | 2011-04-23 |
* | | | | | | | | | | | | | | | Merge branch 'js/blame-parsename' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |