summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update mailmap for a handful of folksJunio C Hamano2012-09-031-0/+9
* The third batch for 1.8.0Junio C Hamano2012-09-031-0/+45
* Merge branch 'js/use-sc-open-max'Junio C Hamano2012-09-031-7/+19
|\
| * sha1_file.c: introduce get_max_fd_limit() helperJoachim Schmitz2012-08-241-7/+19
* | Merge branch 'js/compat-mkdir'Junio C Hamano2012-09-032-0/+29
|\ \
| * | compat: some mkdir() do not like a slash at the endJoachim Schmitz2012-08-242-0/+29
| |/
* | Merge branch 'js/no-curl-easy-strerror-on-old-curl'Junio C Hamano2012-09-031-0/+2
|\ \
| * | http.c: don't use curl_easy_strerror prior to curl-7.12.0Joachim Schmitz2012-08-231-0/+2
| |/
* | Merge branch 'jc/maint-mergetool-style-fix'Junio C Hamano2012-09-031-273/+308
|\ \
| * | mergetool: style fixesJunio C Hamano2012-08-231-273/+308
* | | Merge branch 'sz/submodule-force-update'Junio C Hamano2012-09-033-2/+21
|\ \ \
| * | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-243-2/+21
* | | | Merge branch 'ph/stash-rerere'Junio C Hamano2012-09-032-0/+39
|\ \ \ \
| * | | | stash: invoke rerere in case of conflictPhil Hord2012-08-172-1/+2
| * | | | test: git-stash conflict sets up rererePhil Hord2012-08-171-0/+38
* | | | | Merge branch 'jc/daemon-access-hook'Junio C Hamano2012-09-032-0/+93
|\ \ \ \ \
| * | | | | daemon: --access-hook optionJunio C Hamano2012-08-152-0/+93
* | | | | | Merge branch 'jc/send-email-reconfirm'Junio C Hamano2012-09-031-3/+13
|\ \ \ \ \ \
| * | | | | | send-email: validate & reconfirm interactive responsesJunio C Hamano2012-08-141-3/+13
* | | | | | | Merge branch 'cw/cherry-pick-allow-empty-message'Junio C Hamano2012-09-035-0/+16
|\ \ \ \ \ \ \
| * | | | | | | cherry-pick: add --allow-empty-message optionChris Webb2012-08-065-0/+16
* | | | | | | | Merge branch 'jc/maint-sane-execvp-notdir'Junio C Hamano2012-09-031-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | sane_execvp(): ignore non-directory on $PATHJunio C Hamano2012-07-311-0/+2
* | | | | | | | | Merge branch 'jc/maint-config-exit-status'Junio C Hamano2012-09-033-6/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config: "git config baa" should exit with status 1Junio C Hamano2012-07-303-6/+11
* | | | | | | | | | Latter half of the second batch for 1.8.0Junio C Hamano2012-08-291-1/+30
* | | | | | | | | | Merge branch 'rr/precompose-utf8-cleanup'Junio C Hamano2012-08-291-25/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | precompose-utf8: do not call checks for non-ascii "utf8"Junio C Hamano2012-08-201-8/+8
| * | | | | | | | | | cleanup precompose_utf8Robin Rosenberg2012-08-171-20/+14
* | | | | | | | | | | Merge branch 'mh/maint-config-doc-proxy-command'Junio C Hamano2012-08-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-config doc: unconfuse an exampleJunio C Hamano2012-08-181-1/+1
| * | | | | | | | | | | git-config.txt: fix exampleMichael Haggerty2012-08-181-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ef/win32-cred-helper'Junio C Hamano2012-08-293-0/+375
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | contrib: add win32 credential-helperErik Faye-Lund2012-08-163-0/+375
* | | | | | | | | | | | Merge branch 'hv/submodule-path-unmatch'Junio C Hamano2012-08-292-7/+52
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Let submodule command exit with error status if path does not existHeiko Voigt2012-08-142-7/+52
* | | | | | | | | | | | | Merge branch 'jc/capabilities'Junio C Hamano2012-08-298-17/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fetch-pack: mention server version with verbose outputJeff King2012-08-131-1/+8
| * | | | | | | | | | | | | parse_feature_request: make it easier to see feature valuesJeff King2012-08-132-10/+39
| * | | | | | | | | | | | | fetch-pack: do not ask for unadvertised capabilitiesJunio C Hamano2012-08-101-0/+6
| * | | | | | | | | | | | | do not send client agent unless server does firstJeff King2012-08-102-4/+15
| * | | | | | | | | | | | | send-pack: fix capability-sending logicJeff King2012-08-101-1/+1
| * | | | | | | | | | | | | include agent identifier in capability stringJeff King2012-08-036-6/+38
* | | | | | | | | | | | | | Merge branch 'mg/rebase-i-onto-reflog-in-full'Junio C Hamano2012-08-291-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase -i: use full onto sha1 in reflogMichael J Gruber2012-08-101-2/+1
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mz/empty-rebase-test'Junio C Hamano2012-08-291-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add tests for 'git rebase --keep-empty'Martin von Zweigbergk2012-08-091-1/+17
* | | | | | | | | | | | | | | Merge branch 'jc/maint-protect-sh-from-ifs'Junio C Hamano2012-08-291-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | sh-setup: protect from exported IFSJunio C Hamano2012-08-081-0/+4
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bc/prune-info'Junio C Hamano2012-08-291-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \