Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -0/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -4/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-tag(1): we tag HEAD by default | Thomas Rast | 2013-04-03 | 1 | -0/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/sha1-name-object-peeler' | Junio C Hamano | 2013-04-03 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | peel_onion(): teach $foo^{object} peeler | Junio C Hamano | 2013-03-31 | 2 | -1/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish | Junio C Hamano | 2013-03-31 | 1 | -0/+2 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' | Junio C Hamano | 2013-04-03 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5516: test interaction between pushURL and pushInsteadOf correctly | Junio C Hamano | 2013-03-28 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/submodule-summary-limit' | Junio C Hamano | 2013-04-03 | 1 | -6/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule summary: support --summary-limit=<n> | René Scharfe | 2013-04-01 | 1 | -6/+11 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/valgrind' | Junio C Hamano | 2013-04-03 | 4 | -17/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: notice valgrind error in test_must_fail | Thomas Rast | 2013-04-01 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests --valgrind: provide a mode without --track-origins | Thomas Rast | 2013-04-01 | 2 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: parameterize --valgrind option | Thomas Rast | 2013-04-01 | 3 | -16/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/README: --valgrind already implies -v | Thomas Rast | 2013-04-01 | 1 | -2/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/prompt-revert-head' | Junio C Hamano | 2013-04-03 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bash: teach __git_ps1 about REVERT_HEAD | Robin Rosenberg | 2013-03-31 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/branch-rename-nothing-error' | Junio C Hamano | 2013-04-03 | 2 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: give better message when no names specified for rename | Jonathon Mah | 2013-03-31 | 2 | -2/+4 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/iterm-is-on-osx' | Junio C Hamano | 2013-04-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS X | John Szakmeister | 2013-03-29 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully' | Junio C Hamano | 2013-04-03 | 6 | -18/+174 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: leave repo in place after checkout errors | Jeff King | 2013-03-29 | 2 | -1/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: run check_everything_connected | Jeff King | 2013-03-27 | 3 | -8/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: die on errors from unpack_trees | Jeff King | 2013-03-27 | 3 | -3/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tests for cloning corrupted repositories | Jeff King | 2013-03-27 | 1 | -0/+41 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streaming_write_entry: propagate streaming errors | Jeff King | 2013-03-27 | 2 | -7/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add test for streaming corrupt blobs | Jeff King | 2013-03-27 | 1 | -0/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid infinite loop in read_istream_loose | Jeff King | 2013-03-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_istream_filtered: propagate read error from upstream | Jeff King | 2013-03-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check_sha1_signature: check return value from read_istream | Jeff King | 2013-03-27 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stream_blob_to_fd: detect errors reading from stream | Jeff King | 2013-03-27 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent' | Junio C Hamano | 2013-04-03 | 4 | -7/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test: resurrect q_to_tab | Junio C Hamano | 2013-03-29 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply --whitespace=fix: avoid running over the postimage buffer | Junio C Hamano | 2013-03-22 | 4 | -9/+39 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/difftool-no-overwrite-on-copyback' | Junio C Hamano | 2013-04-03 | 2 | -51/+139 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: run --dir-diff tests with and without symlinks | John Keeping | 2013-03-29 | 1 | -8/+19 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: fix tests when difftool uses --no-symlinks | John Keeping | 2013-03-29 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: don't hide grep output | John Keeping | 2013-03-29 | 1 | -27/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: don't overwrite modified files | John Keeping | 2013-03-29 | 2 | -14/+101 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: move '--symlinks' specific test to the end | John Keeping | 2013-03-29 | 1 | -15/+15 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/directory-attrs-regression-fix' | Junio C Hamano | 2013-04-03 | 3 | -19/+91 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t: check that a pattern without trailing slash matches a directory | Jeff King | 2013-03-28 | 1 | -0/+27 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c::match_pathname(): pay attention to the length of string parameters | Jeff King | 2013-03-28 | 1 | -1/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c::match_pathname(): adjust patternlen when shifting pattern | Jeff King | 2013-03-28 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c::match_basename(): pay attention to the length of string parameters | Junio C Hamano | 2013-03-28 | 1 | -4/+36 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr.c::path_matches(): special case paths that end with a slash | Junio C Hamano | 2013-03-28 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr.c::path_matches(): the basename is part of the pathname | Junio C Hamano | 2013-03-26 | 1 | -9/+10 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls' | Junio C Hamano | 2013-04-03 | 5 | -8/+80 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: avoid unnecessary match_pathspec calls | Nguyễn Thái Ngọc Duy | 2013-03-27 | 5 | -8/+80 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |