Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maint | Junio C Hamano | 2011-08-23 | 1 | -0/+5 |
|\ | |||||
| * | t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met | Junio C Hamano | 2011-06-15 | 1 | -0/+5 |
* | | Merge branch 'jk/tag-list-multiple-patterns' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+5 |
|\ \ | |||||
| * | | tag: accept multiple patterns for --list | Jeff King | 2011-06-20 | 1 | -0/+5 |
* | | | Merge branch 'jl/submodule-update-quiet' into maint | Junio C Hamano | 2011-08-16 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | submodule: update and add must honor --quiet flag | Jens Lehmann | 2011-07-28 | 1 | -2/+4 |
* | | | | Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | submodule add: allow relative repository path even when no url is set | Jens Lehmann | 2011-06-06 | 1 | -2/+5 |
| * | | | | submodule add: test failure when url is not configured in superproject | Jens Lehmann | 2011-06-06 | 1 | -0/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'js/ls-tree-error' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+24 |
|\ \ \ \ | |||||
| * | | | | Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. | Jon Seymour | 2011-07-25 | 1 | -1/+1 |
| * | | | | Add a test to check that git ls-tree sets non-zero exit code on error. | Jon Seymour | 2011-07-24 | 1 | -0/+24 |
* | | | | | Merge branch 'jk/fast-export-quote-path' into maint | Junio C Hamano | 2011-08-16 | 1 | -1/+27 |
|\ \ \ \ \ | |||||
| * | | | | | fast-export: quote paths in output | Jeff King | 2011-08-05 | 1 | -1/+27 |
* | | | | | | Merge branch 'jc/maint-reset-unmerged-path' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reset [<commit>] paths...: do not mishandle unmerged paths | Junio C Hamano | 2011-07-13 | 1 | -0/+15 |
* | | | | | | | Merge branch 'jc/submodule-sync-no-auto-vivify' into maint | Junio C Hamano | 2011-08-16 | 1 | -2/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule sync: do not auto-vivify uninteresting submodule | Junio C Hamano | 2011-06-26 | 1 | -2/+13 |
* | | | | | | | | Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-submodule.sh: preserve stdin for the command spawned by foreach | Brandon Casey | 2011-06-29 | 1 | -2/+2 |
| * | | | | | | | | t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin | Brandon Casey | 2011-06-29 | 1 | -0/+18 |
* | | | | | | | | | Merge branch 'aw/rebase-i-p' into maint | Junio C Hamano | 2011-08-16 | 3 | -3/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase -i -p: include non-first-parent commits in todo list | Andrew Wong | 2011-06-19 | 3 | -3/+29 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/combine-diff-binary-etc' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+212 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | combine-diff: respect textconv attributes | Jeff King | 2011-05-24 | 1 | -0/+99 |
| * | | | | | | | | | combine-diff: handle binary files as binary | Jeff King | 2011-05-23 | 1 | -0/+113 |
* | | | | | | | | | | Merge branch 'jl/maint-fetch-recursive-fix' into maint | Junio C Hamano | 2011-08-01 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fetch: Also fetch submodules in subdirectories in on-demand mode | Jens Lehmann | 2011-06-20 | 1 | -8/+8 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/maint-1.7.3-checkout-describe' into maint | Junio C Hamano | 2011-08-01 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | checkout -b <name>: correctly detect existing branch | Junio C Hamano | 2011-06-05 | 1 | -0/+11 |
* | | | | | | | | | | | t7400: fix bogus test failure with symlinked trash | Jeff King | 2011-07-31 | 1 | -2/+4 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | tests: print failed test numbers at the end of the test run | Jens Lehmann | 2011-07-24 | 1 | -1/+13 |
| |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge git://bogomips.org/git-svn into maint | Junio C Hamano | 2011-06-29 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-svn: Correctly handle root commits in mergeinfo ranges | Michael Haggerty | 2011-06-28 | 1 | -1/+1 |
| * | | | | | | | | | git-svn: Demonstrate a bug with root commits in mergeinfo ranges | Michael Haggerty | 2011-06-28 | 1 | -0/+33 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'maint-1.7.5' into maint | Junio C Hamano | 2011-06-29 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | test: skip clean-up when running under --immediate mode | Junio C Hamano | 2011-06-29 | 1 | -2/+10 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'jk/maint-config-alias-fix' into maint | Junio C Hamano | 2011-06-01 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ml/test-readme' into maint | Junio C Hamano | 2011-05-31 | 1 | -8/+9 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ab/i18n-fixup' into maint | Junio C Hamano | 2011-05-31 | 36 | -363/+343 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/rename-degrade-cc-to-c' into maint | Junio C Hamano | 2011-05-31 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/run-command-error-failure' into maint | Junio C Hamano | 2011-05-29 | 1 | -0/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mk/grep-pcre' | Junio C Hamano | 2011-06-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t7810: avoid unportable use of "echo" | Junio C Hamano | 2011-06-20 | 1 | -3/+3 |
* | | | | | | | | | | | | | | Merge branch 'di/no-no-existant' | Junio C Hamano | 2011-06-19 | 6 | -13/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fix typo: existant->existent | Dmitry Ivankov | 2011-06-16 | 6 | -13/+13 |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | tests: link shell libraries into valgrind directory | Jeff King | 2011-06-17 | 1 | -2/+7 |
* | | | | | | | | | | | | | | t/Makefile: pass test opts to valgrind target properly | Jeff King | 2011-06-17 | 1 | -1/+1 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | gitweb: do not misparse nonnumeric content tag files that contain a digit | Jonathan Nieder | 2011-06-09 | 1 | -0/+8 |
* | | | | | | | | | | | | | Merge branch 'jc/magic-pathspec' | Junio C Hamano | 2011-06-07 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |