summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/http-push-ref-status'Junio C Hamano2010-01-206-49/+137
|\
| * transport-helper.c::push_refs(): emit "no refs" error messageTay Ray Chuan2010-01-091-1/+4
| * transport-helper.c::push_refs(): ignore helper-reported status if ref is not ...Tay Ray Chuan2010-01-092-1/+10
| * transport.c::transport_push(): make ref status affect return valueTay Ray Chuan2010-01-092-4/+7
| * refactor ref status logic for pushingTay Ray Chuan2010-01-096-48/+77
| * t5541-http-push.sh: add test for unmatched, non-fast-forwarded refsTay Ray Chuan2010-01-091-0/+21
| * t5541-http-push.sh: add tests for non-fast-forward pushesTay Ray Chuan2010-01-091-0/+23
* | Merge branch 'bk/fix-relative-gitdir-file'Junio C Hamano2010-01-202-3/+57
|\ \
| * | Handle relative paths in submodule .git filesBrad King2010-01-092-4/+20
| * | Test update-index for a gitlink to a .git fileBrad King2010-01-091-0/+38
* | | Merge branch 'sd/cd-p-show-toplevel'Junio C Hamano2010-01-203-14/+14
|\ \ \
| * | | Use $(git rev-parse --show-toplevel) in cd_to_toplevel().Steven Drake2010-01-111-14/+5
| * | | Add 'git rev-parse --show-toplevel' option.Steven Drake2010-01-112-0/+9
* | | | Merge branch 'jc/symbol-static'Junio C Hamano2010-01-2030-142/+34
|\ \ \ \
| * | | | date.c: mark file-local function staticJunio C Hamano2010-01-202-2/+1
| * | | | Replace parse_blob() with an explanatory commentDaniel Barkalow2010-01-182-22/+8
| * | | | symlinks.c: remove unused functionsJunio C Hamano2010-01-172-33/+0
| * | | | object.c: remove unused functionsJunio C Hamano2010-01-172-26/+0
| * | | | strbuf.c: remove unused functionJunio C Hamano2010-01-122-8/+0
| * | | | sha1_file.c: remove unused functionJunio C Hamano2010-01-122-9/+0
| * | | | mailmap.c: remove unused functionJunio C Hamano2010-01-122-6/+0
| * | | | utf8.c: mark file-local function staticJunio C Hamano2010-01-122-2/+1
| * | | | submodule.c: mark file-local function staticJunio C Hamano2010-01-121-1/+1
| * | | | quote.c: mark file-local function staticJunio C Hamano2010-01-122-2/+1
| * | | | remote-curl.c: mark file-local function staticJunio C Hamano2010-01-121-1/+1
| * | | | read-cache.c: mark file-local functions staticJunio C Hamano2010-01-122-4/+4
| * | | | parse-options.c: mark file-local function staticJunio C Hamano2010-01-122-5/+5
| * | | | entry.c: mark file-local function staticJunio C Hamano2010-01-122-4/+1
| * | | | http.c: mark file-local functions staticJunio C Hamano2010-01-122-11/+8
| * | | | pretty.c: mark file-local function staticJunio C Hamano2010-01-112-2/+1
| * | | | builtin-rev-list.c: mark file-local function staticJunio C Hamano2010-01-112-3/+1
| * | | | bisect.c: mark file-local function staticJunio C Hamano2010-01-111-1/+1
* | | | | Sync with 1.6.6.1Junio C Hamano2010-01-203-8/+45
|\ \ \ \ \
| * | | | | Git 1.6.6.1v1.6.6.1Junio C Hamano2010-01-203-8/+16
| * | | | | Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2010-01-202-6/+18
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sb/maint-octopus' into maintJunio C Hamano2010-01-202-9/+57
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'bg/maint-add-all-doc' into maintJunio C Hamano2010-01-202-29/+88
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-205-9/+40
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Git 1.6.5.8v1.6.5.8Junio C Hamano2010-01-204-3/+32
| | * | | | | | | | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2010-01-202-4/+8
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1...Junio C Hamano2010-01-201-4/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5Junio C Hamano2010-01-201-5/+5
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5Junio C Hamano2010-01-201-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-188-43/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-188-43/+47
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-188-43/+47
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-181-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Fix mis-backport of t7002Junio C Hamano2010-01-181-1/+5
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-191-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | bisect: fix singular/plural grammar nitDavid Ripton2010-01-191-3/+5