summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano2011-10-133-3/+15
|\
| * diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano2011-10-032-0/+8
| * Revert removal of multi-match discard heuristic in 27af01René Scharfe2011-09-261-3/+7
* | Merge branch 'rs/pending'Junio C Hamano2011-10-138-49/+64
|\ \
| * | commit: factor out clear_commit_marks_for_object_arrayrs/pendingRené Scharfe2011-10-035-14/+19
| * | checkout: use leak_pending flagRené Scharfe2011-10-031-13/+12
| * | bundle: use leak_pending flagRené Scharfe2011-10-031-5/+3
| * | bisect: use leak_pending flagRené Scharfe2011-10-031-5/+8
| * | revision: add leak_pending flagRené Scharfe2011-10-032-1/+3
| * | checkout: use add_pending_{object,sha1} in orphan checkRené Scharfe2011-10-031-27/+12
| * | revision: factor out add_pending_sha1René Scharfe2011-10-032-3/+9
| * | checkout: check for "Previous HEAD" notice in t2020René Scharfe2011-10-031-2/+5
* | | Merge branch 'jn/no-g-plus-s-on-bsd'Junio C Hamano2011-10-131-0/+1
|\ \ \
| * | | Makefile: do not set setgid bit on directories on GNU/kFreeBSDJonathan Nieder2011-10-031-0/+1
* | | | Merge branch 'jc/is-url-simplify'Junio C Hamano2011-10-131-26/+6
|\ \ \ \
| * | | | url.c: simplify is_url()jc/is-url-simplifyJunio C Hamano2011-10-031-26/+6
* | | | | Merge branch 'nd/git-daemon-error-msgs'Junio C Hamano2011-10-131-4/+8
|\ \ \ \ \
| * | | | | daemon: return "access denied" if a service is not allowednd/git-daemon-error-msgsNguyễn Thái Ngọc Duy2011-10-031-4/+8
| |/ / / /
* | | | | Merge branch 'nd/daemon-log-sock-errors'Junio C Hamano2011-10-131-0/+37
|\ \ \ \ \
| * | | | | daemon: log errors if we could not use some socketsnd/daemon-log-sock-errorsNguyễn Thái Ngọc Duy2011-10-031-0/+37
| | |_|/ / | |/| | |
* | | | | Merge branch 'cp/git-web-browse-browsers'Junio C Hamano2011-10-132-5/+71
|\ \ \ \ \
| * | | | | git-web--browse: avoid the use of evalcp/git-web-browse-browsersChris Packham2011-10-032-5/+71
| |/ / / /
* | | | | Merge branch 'jc/apply-blank-at-eof-fix'Junio C Hamano2011-10-131-2/+9
|\ \ \ \ \
| * | | | | apply --whitespace=error: correctly report new blank lines at endJunio C Hamano2011-09-261-2/+9
* | | | | | Merge branch 'di/fast-import-empty-tag-note-fix'Junio C Hamano2011-10-132-0/+33
|\ \ \ \ \ \
| * | | | | | fast-import: don't allow to note on empty branchdi/fast-import-empty-tag-note-fixDmitry Ivankov2011-09-222-0/+19
| * | | | | | fast-import: don't allow to tag empty branchDmitry Ivankov2011-09-222-0/+14
* | | | | | | Merge branch 'nd/maint-autofix-tag-in-head'Junio C Hamano2011-10-137-65/+93
|\ \ \ \ \ \ \
| * | | | | | | Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy2011-09-187-14/+34
| * | | | | | | merge: remove global variable head[]Nguyễn Thái Ngọc Duy2011-09-181-44/+53
| * | | | | | | merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy2011-09-181-1/+1
| * | | | | | | merge: keep stash[] a local variableNguyễn Thái Ngọc Duy2011-08-261-17/+16
* | | | | | | | Merge branch 'bw/grep-no-index-no-exclude'Junio C Hamano2011-10-132-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | grep --no-index: don't use git standard exclusionsbw/grep-no-index-no-excludeBert Wesarg2011-09-152-2/+1
| * | | | | | | | grep: do not use --index in the short usage outputBert Wesarg2011-09-151-2/+3
* | | | | | | | | Merge branch 'nd/maint-sparse-errors'Junio C Hamano2011-10-132-4/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add explanation why we do not allow to sparse checkout to empty working treend/maint-sparse-errorsNguyễn Thái Ngọc Duy2011-09-221-1/+6
| * | | | | | | | | sparse checkout: show error messages when worktree shaping failsNguyễn Thái Ngọc Duy2011-09-222-3/+25
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-121-1/+12
* | | | | | | | | Merge branch 'cb/do-not-pretend-to-hijack-long-help'Junio C Hamano2011-10-126-7/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use -h for synopsis and --help for manpage consistentlycb/do-not-pretend-to-hijack-long-helpClemens Buchacher2011-10-056-7/+6
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'sp/smart-http-failure'Junio C Hamano2011-10-121-1/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote-curl: Fix warning after HTTP failureShawn O. Pearce2011-10-041-1/+8
* | | | | | | | | | Merge branch 'nd/document-err-packet'Junio C Hamano2011-10-121-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pack-protocol: document "ERR" linend/document-err-packetNguyen Thai Ngoc Duy2011-10-031-0/+7
* | | | | | | | | | | Merge branch 'jc/parse-options-boolean'Junio C Hamano2011-10-1210-22/+53
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | apply: use OPT_NOOP_NOARGjc/parse-options-booleanRené Scharfe2011-09-281-7/+2
| * | | | | | | | | | | revert: use OPT_NOOP_NOARGRené Scharfe2011-09-281-3/+1
| * | | | | | | | | | | parseopt: add OPT_NOOP_NOARGRené Scharfe2011-09-285-1/+18
| * | | | | | | | | | | archive.c: use OPT_BOOL()Junio C Hamano2011-09-272-2/+11