Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge branch 'aw/rebase-i-p' | Junio C Hamano | 2011-07-13 | 3 | -3/+29 | |
|\ | ||||||
| * | rebase -i -p: include non-first-parent commits in todo list | Andrew Wong | 2011-06-19 | 3 | -3/+29 | |
* | | Merge branch 'jc/no-gitweb-test-without-cgi-etc' | Junio C Hamano | 2011-07-13 | 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 'fg/submodule-keep-updating' | Junio C Hamano | 2011-07-13 | 1 | -0/+144 | |
|\ \ | ||||||
| * | | submodule update: continue when a checkout fails | Fredrik Gustafsson | 2011-06-13 | 1 | -0/+144 | |
| |/ | ||||||
* | | Merge branch 'jc/streaming-filter' into next | Junio C Hamano | 2011-06-29 | 1 | -17/+34 | |
|\ \ | ||||||
| * | | t0021: test application of both crlf and ident | Junio C Hamano | 2011-05-26 | 1 | -8/+24 | |
| * | | t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test | René Scharfe | 2011-05-26 | 1 | -11/+12 | |
| | | | ||||||
| | \ | ||||||
| | \ | ||||||
| | \ | ||||||
| *---. \ | Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming | Junio C Hamano | 2011-05-15 | 2 | -2/+43 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge branch 'da/git-prefix-everywhere' into next | Junio C Hamano | 2011-06-29 | 2 | -0/+49 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests | David Aguilar | 2011-06-02 | 1 | -0/+33 | |
| * | | | | | | setup: Provide GIT_PREFIX to built-ins | David Aguilar | 2011-05-26 | 1 | -0/+16 | |
* | | | | | | | Merge branch 'ab/i18n-scripts' into next | Junio C Hamano | 2011-06-29 | 6 | -14/+15 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | i18n: git-submodule "blob" and "submodule" messages | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -4/+4 | |
| * | | | | | | | i18n: git-submodule "path not initialized" message | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -1/+1 | |
| * | | | | | | | i18n: git-submodule "[...] path is ignored" message | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -1/+1 | |
| * | | | | | | | i18n: git-submodule "Entering [...]" message | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -2/+2 | |
| * | | | | | | | i18n: git-submodule $errmsg messages | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -1/+1 | |
| * | | | | | | | i18n: git-submodule "Submodule change[...]" messages | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -1/+1 | |
| * | | | | | | | i18n: git-submodule $update_module say + die messages | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -1/+1 | |
| * | | | | | | | i18n: git-am core say messages | Ævar Arnfjörð Bjarmason | 2011-05-21 | 2 | -3/+4 | |
* | | | | | | | | Merge branch 'rs/grep-color' | Junio C Hamano | 2011-06-29 | 1 | -0/+95 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | grep: add --heading | René Scharfe | 2011-06-05 | 1 | -0/+37 | |
| * | | | | | | | | grep: add --break | René Scharfe | 2011-06-05 | 1 | -0/+28 | |
| * | | | | | | | | grep: fix coloring of hunk marks between files | René Scharfe | 2011-06-05 | 1 | -0/+30 | |
* | | | | | | | | | Merge branch 'jc/maint-1.7.3-checkout-describe' | Junio C Hamano | 2011-06-29 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | checkout -b <name>: correctly detect existing branch | Junio C Hamano | 2011-06-05 | 1 | -0/+11 | |
* | | | | | | | | | | Merge branch 'jk/maint-1.7.2-status-ignored' | Junio C Hamano | 2011-06-29 | 1 | -0/+121 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | git status --ignored: tests and docs | Junio C Hamano | 2011-06-02 | 1 | -0/+121 | |
* | | | | | | | | | | | Merge branch 'mg/diff-stat-count' | Junio C Hamano | 2011-06-29 | 1 | -0/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | diff --stat-count: finishing touches | Junio C Hamano | 2011-05-27 | 1 | -0/+25 | |
* | | | | | | | | | | | | Merge branch 'jk/combine-diff-binary-etc' | Junio C Hamano | 2011-06-29 | 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 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 |