summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1Junio C Hamano2013-04-031-0/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano2013-04-031-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-tag(1): we tag HEAD by defaultThomas Rast2013-04-031-0/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/sha1-name-object-peeler'Junio C Hamano2013-04-032-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | peel_onion(): teach $foo^{object} peelerJunio C Hamano2013-03-312-1/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | peel_onion: disambiguate to favor tree-ish when we know we want a tree-ishJunio C Hamano2013-03-311-0/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL'Junio C Hamano2013-04-031-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5516: test interaction between pushURL and pushInsteadOf correctlyJunio C Hamano2013-03-281-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/submodule-summary-limit'Junio C Hamano2013-04-031-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule summary: support --summary-limit=<n>René Scharfe2013-04-011-6/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/valgrind'Junio C Hamano2013-04-034-17/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: notice valgrind error in test_must_failThomas Rast2013-04-011-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests --valgrind: provide a mode without --track-originsThomas Rast2013-04-012-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: parameterize --valgrind optionThomas Rast2013-04-013-16/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/README: --valgrind already implies -vThomas Rast2013-04-011-2/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/prompt-revert-head'Junio C Hamano2013-04-031-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bash: teach __git_ps1 about REVERT_HEADRobin Rosenberg2013-03-311-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/branch-rename-nothing-error'Junio C Hamano2013-04-032-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: give better message when no names specified for renameJonathon Mah2013-03-312-2/+4
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/iterm-is-on-osx'Junio C Hamano2013-04-031-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS XJohn Szakmeister2013-03-291-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-036-18/+174
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: leave repo in place after checkout errorsJeff King2013-03-292-1/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: run check_everything_connectedJeff King2013-03-273-8/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: die on errors from unpack_treesJeff King2013-03-273-3/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tests for cloning corrupted repositoriesJeff King2013-03-271-0/+41
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streaming_write_entry: propagate streaming errorsJeff King2013-03-272-7/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add test for streaming corrupt blobsJeff King2013-03-271-0/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid infinite loop in read_istream_looseJeff King2013-03-271-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_istream_filtered: propagate read error from upstreamJeff King2013-03-271-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check_sha1_signature: check return value from read_istreamJeff King2013-03-271-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stream_blob_to_fd: detect errors reading from streamJeff King2013-03-271-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent'Junio C Hamano2013-04-034-7/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test: resurrect q_to_tabJunio C Hamano2013-03-291-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-224-9/+39
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/difftool-no-overwrite-on-copyback'Junio C Hamano2013-04-032-51/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: run --dir-diff tests with and without symlinksJohn Keeping2013-03-291-8/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: fix tests when difftool uses --no-symlinksJohn Keeping2013-03-291-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: don't hide grep outputJohn Keeping2013-03-291-27/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: don't overwrite modified filesJohn Keeping2013-03-292-14/+101
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: move '--symlinks' specific test to the endJohn Keeping2013-03-291-15/+15
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/directory-attrs-regression-fix'Junio C Hamano2013-04-033-19/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t: check that a pattern without trailing slash matches a directoryJeff King2013-03-281-0/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c::match_pathname(): pay attention to the length of string parametersJeff King2013-03-281-1/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c::match_pathname(): adjust patternlen when shifting patternJeff King2013-03-281-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c::match_basename(): pay attention to the length of string parametersJunio C Hamano2013-03-281-4/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr.c::path_matches(): special case paths that end with a slashJunio C Hamano2013-03-281-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr.c::path_matches(): the basename is part of the pathnameJunio C Hamano2013-03-261-9/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'Junio C Hamano2013-04-035-8/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy2013-03-275-8/+80
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |