summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-171-1/+37
* | | | | | | | | | | | Merge branch 'jk/http-auth'Junio C Hamano2011-10-179-69/+130
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | http_init: accept separate URL parameterJeff King2011-10-155-16/+8
| * | | | | | | | | | | | http: use hostname in credential descriptionMichael J Gruber2011-10-152-10/+37
| * | | | | | | | | | | | http: retry authentication failures for all http requestsJeff King2011-07-201-6/+11
| * | | | | | | | | | | | remote-curl: don't retry auth failures with dumb protocolJeff King2011-07-201-1/+1
| * | | | | | | | | | | | improve httpd auth testsJeff King2011-07-202-8/+53
| * | | | | | | | | | | | url: decode buffers that are not NUL-terminatedJeff King2011-07-203-31/+23
* | | | | | | | | | | | | Merge branch 'js/check-ref-format-test-mingw'Junio C Hamano2011-10-171-36/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t1402-check-ref-format: skip tests of refs beginning with slash on WindowsJohannes Sixt2011-10-131-36/+52
* | | | | | | | | | | | | | Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano2011-10-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-132-2/+2
* | | | | | | | | | | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-171-83/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | t1300: test mixed-case variable retrievalJeff King2011-10-121-0/+27
| * | | | | | | | | | | | | | t1300: put git invocations inside test functionJeff King2011-10-121-83/+93
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bc/attr-ignore-case'Junio C Hamano2011-10-1710-34/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2011-10-112-3/+61
| * | | | | | | | | | | | | | attr: read core.attributesfile from git_default_core_configJunio C Hamano2011-10-065-13/+9
| * | | | | | | | | | | | | | builtin/mv.c: plug miniscule memory leakBrandon Casey2011-10-061-1/+5
| * | | | | | | | | | | | | | cleanup: use internal memory allocation wrapper functions everywhereBrandon Casey2011-10-067-8/+8
| * | | | | | | | | | | | | | attr.c: avoid inappropriate access to strbuf "buf" memberBrandon Casey2011-10-061-13/+11
* | | | | | | | | | | | | | | Merge branch 'sg/completion'Junio C Hamano2011-10-171-18/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | completion: unite --format and --pretty for 'log' and 'show'SZEDER Gábor2011-10-101-14/+4
| * | | | | | | | | | | | | | | completion: unite --reuse-message and --reedit-message for 'notes'SZEDER Gábor2011-10-101-4/+2
* | | | | | | | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display'Junio C Hamano2011-10-172-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | config: display key_delim for config --bool --get-regexpMatthieu Moy2011-10-102-7/+19
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'tc/fetch-leak'Junio C Hamano2011-10-171-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fetch: plug two leaks on error exit in store_updated_refsTay Ray Chuan2011-10-071-4/+9
* | | | | | | | | | | | | | | | | Merge branch 'jk/name-hash-dirent'Junio C Hamano2011-10-172-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fix phantom untracked files when core.ignorecase is setJeff King2011-10-072-7/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ef/mingw-syslog'Junio C Hamano2011-10-171-12/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | mingw: avoid using strbuf in syslogef/mingw-syslogErik Faye-Lund2011-10-071-12/+18
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'tm/completion-push-set-upstream'Junio C Hamano2011-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | completion: push --set-upstreamtm/completion-push-set-upstreamTeemu Matilainen2011-10-061-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'tm/completion-commit-fixup-squash'Junio C Hamano2011-10-171-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | completion: commit --fixup and --squashtm/completion-commit-fixup-squashTeemu Matilainen2011-10-061-2/+3
| * | | | | | | | | | | | | | | | | completion: unite --reuse-message and --reedit-message handlingTeemu Matilainen2011-10-061-6/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ph/push-to-delete-nothing'Junio C Hamano2011-10-172-8/+215
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooksph/push-to-delete-nothingPang Yan Han2011-09-304-8/+211
* | | | | | | | | | | | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes'Junio C Hamano2011-10-172-1/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-302-1/+47
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'js/bisect-no-checkout'Junio C Hamano2011-10-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | bisect: fix exiting when checkout failed in bisect_start()Christian Couder2011-09-211-1/+2
* | | | | | | | | | | | | | | | | | | resolve_gitlink_packed_ref(): fix mismergeJunio C Hamano2011-10-172-1/+30
* | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-161-1/+3
* | | | | | | | | | | | | | | | | | | Merge git://repo.or.cz/git-guiJunio C Hamano2011-10-169-29/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-gui: incremental goto line in blame viewBert Wesarg2011-10-151-4/+11
| * | | | | | | | | | | | | | | | | | | git-gui: clear the goto line input when hidingBert Wesarg2011-10-151-0/+1
| * | | | | | | | | | | | | | | | | | | git-gui: only accept numbers in the goto-line inputBert Wesarg2011-10-151-2/+11
| * | | | | | | | | | | | | | | | | | | git-gui: search and linenumber input are mutual exclusive in the blame viewBert Wesarg2011-10-151-6/+16