Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tests: Skip tests in a way that makes sense under TAP | Ævar Arnfjörð Bjarmason | 2010-06-25 | 40 | -54/+56 |
* | test-lib: output a newline before "ok" under a TAP harness | Ævar Arnfjörð Bjarmason | 2010-06-25 | 1 | -0/+3 |
* | test-lib: Make the test_external_* functions TAP-aware | Ævar Arnfjörð Bjarmason | 2010-06-25 | 3 | -12/+53 |
* | test-lib: Adjust output to be valid TAP format | Ævar Arnfjörð Bjarmason | 2010-06-25 | 2 | -30/+59 |
* | Merge branch 'sb/format-patch-signature' | Junio C Hamano | 2010-06-22 | 2 | -0/+55 |
|\ | |||||
| * | format-patch: Add a signature option (--signature) | Stephen Boyd | 2010-06-16 | 2 | -0/+55 |
* | | Merge branch 'mg/pretty-magic-space' | Junio C Hamano | 2010-06-22 | 1 | -0/+10 |
|\ \ | |||||
| * | | pretty: Introduce ' ' modifier to add space if non-empty | Michael J Gruber | 2010-06-16 | 1 | -0/+10 |
| |/ | |||||
* | | Merge branch 'cc/cherry-pick-series' | Junio C Hamano | 2010-06-22 | 1 | -0/+95 |
|\ \ | |||||
| * | | revert: add tests to check cherry-picking many commits | Christian Couder | 2010-06-02 | 1 | -0/+95 |
* | | | Merge branch 'jc/rev-list-ancestry-path' | Junio C Hamano | 2010-06-22 | 1 | -0/+73 |
|\ \ \ | |||||
| * | | | revision: Turn off history simplification in --ancestry-path mode | Johan Herland | 2010-06-06 | 1 | -0/+17 |
| * | | | revision: --ancestry-path | Junio C Hamano | 2010-04-21 | 1 | -0/+56 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-22 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'ic/maint-rebase-i-abort' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+10 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cc/maint-commit-reflog-msg' into maint | Junio C Hamano | 2010-06-22 | 1 | -2/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'tc/commit-abbrev-fix' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+68 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jn/document-rebase-i-p-limitation' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'cc/maint-diff-CC-binary' into maint | Junio C Hamano | 2010-06-22 | 2 | -0/+82 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/t9129-any-utf8' into maint | Junio C Hamano | 2010-06-22 | 1 | -7/+13 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'cb/ls-files-cdup' into maint | Junio C Hamano | 2010-06-22 | 1 | -8/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'tc/merge-m-log' into maint | Junio C Hamano | 2010-06-22 | 1 | -4/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-amend-missing-name' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pc/remove-warn' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | tests: remove unnecessary '^' from 'expr' regular expression | Junio C Hamano | 2010-06-21 | 2 | -3/+3 |
| * | | | | | | | | | | | | | | Merge branch 'cb/assume-unchanged-fix' into maint | Junio C Hamano | 2010-06-21 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/notes-doc' into maint | Junio C Hamano | 2010-06-21 | 1 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/test-cleanup' into maint | Junio C Hamano | 2010-06-21 | 5 | -5/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bg/apply-blank-trailing-context' into maint | Junio C Hamano | 2010-06-21 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-stash-orphaned-file' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+150 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/advice-statushints' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-bundle' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/t7006-fixup' into maint | Junio C Hamano | 2010-06-16 | 2 | -48/+117 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/shortlog' into maint | Junio C Hamano | 2010-06-16 | 2 | -24/+123 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-dumb-http-pack-reidx' into maint | Junio C Hamano | 2010-06-16 | 1 | -3/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint | Junio C Hamano | 2010-06-16 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rc/maint-curl-helper' into maint | Junio C Hamano | 2010-06-16 | 1 | -1/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hg/maint-attr-fix' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/status-optionally-refresh' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/maint-commit-reflog-msg' | Junio C Hamano | 2010-06-21 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: use value of GIT_REFLOG_ACTION env variable as reflog message | Christian Couder | 2010-06-13 | 1 | -2/+4 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ic/maint-rebase-i-abort' | Junio C Hamano | 2010-06-21 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase -i: Abort cleanly if new base cannot be checked out | Ian Ward Comfort | 2010-06-11 | 1 | -0/+10 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 | 2 | -0/+238 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-06 | 1 | -0/+83 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the "crlf" attribute "text" | Eyvind Bernhardsen | 2010-05-19 | 1 | -4/+17 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 | 1 | -6/+6 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 | 1 | -0/+142 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fg/autocrlf' | Junio C Hamano | 2010-06-21 | 1 | -0/+52 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | autocrlf: Make it work also for un-normalized repositories | Finn Arne Gangstad | 2010-05-11 | 1 | -0/+52 |