summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* doc/howto: warn about (dumb)http server document being too oldsc/doc-howto-dumb-httpSitaram Chamarty2013-10-281-0/+4
* git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORYSteffen Prohaska2013-10-151-1/+1
* clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2013-10-142-1/+11
* Git 1.8.4.1v1.8.4.1Jonathan Nieder2013-09-263-15/+37
* Merge branch 'mm/rebase-continue-freebsd-WB' into maintJonathan Nieder2013-09-261-1/+10
|\
| * rebase: fix run_specific_rebase's use of "return" on FreeBSDmm/rebase-continue-freebsd-WBMatthieu Moy2013-09-091-1/+10
* | Merge branch 'km/svn-1.8-serf-only' into maintJonathan Nieder2013-09-262-3/+34
|\ \
| * | Git.pm: revert _temp_cache use of temp_is_lockedkm/svn-1.8-serf-onlyKyle J. McKay2013-07-181-1/+1
| * | git-svn: allow git-svn fetching to work using serfKyle J. McKay2013-07-071-2/+4
| * | Git.pm: add new temp_is_locked functionKyle J. McKay2013-07-071-2/+31
* | | Merge branch 'js/xread-in-full' into maintJonathan Nieder2013-09-261-1/+1
|\ \ \
| * | | stream_to_pack: xread does not guarantee to read all requested bytesjs/xread-in-fullJohannes Sixt2013-08-201-1/+1
* | | | Merge branch 'bc/send-email-ssl-die-message-fix' into maintJonathan Nieder2013-09-261-1/+1
|\ \ \ \
| * | | | send-email: don't call methods on undefined valuesbc/send-email-ssl-die-message-fixBrian M. Carlson2013-09-101-1/+1
* | | | | git-remote-mediawiki: bugfix for pages w/ >500 revisionsBenoit Person2013-09-242-2/+35
* | | | | Start preparing for 1.8.4.1Junio C Hamano2013-09-182-1/+51
* | | | | Merge branch 'bc/completion-for-bash-3.0' into maintJunio C Hamano2013-09-183-3/+7
|\ \ \ \ \
| * | | | | contrib/git-prompt.sh: handle missing 'printf -v' more gracefullybc/completion-for-bash-3.0Brandon Casey2013-08-221-1/+5
| * | | | | t9902-completion.sh: old Bash still does not support array+=('') notationBrandon Casey2013-08-211-1/+1
| * | | | | git-completion.bash: use correct Bash/Zsh array length syntaxBrandon Casey2013-08-211-1/+1
* | | | | | Merge branch 'mm/no-shell-escape-in-die-message' into maintJunio C Hamano2013-09-182-1/+14
|\ \ \ \ \ \
| * | | | | | die_with_status: use "printf '%s\n'", not "echo"mm/no-shell-escape-in-die-messageMatthieu Moy2013-08-072-1/+14
* | | | | | | Merge branch 'jl/some-submodule-config-are-not-boolean' into maintJunio C Hamano2013-09-182-0/+16
|\ \ \ \ \ \ \
| * | | | | | | avoid segfault on submodule.*.path set to an empty "true"jl/some-submodule-config-are-not-booleanJharrod LaFon2013-08-192-0/+16
* | | | | | | | Merge branch 'tr/log-full-diff-keep-true-parents' into maintJunio C Hamano2013-09-188-3/+134
|\ \ \ \ \ \ \ \
| * | | | | | | | log: use true parents for diff when walking reflogstr/log-full-diff-keep-true-parentsThomas Rast2013-08-052-3/+47
| * | | | | | | | log: use true parents for diff even when rewritingThomas Rast2013-08-017-3/+90
* | | | | | | | | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maintJunio C Hamano2013-09-184-31/+134
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/fetch.c: Fix a sparse warningjc/transport-do-not-use-connect-twice-in-fetchRamsay Jones2013-08-281-1/+1
| * | | | | | | | | fetch: work around "transport-take-over" hackJunio C Hamano2013-08-073-0/+21
| * | | | | | | | | fetch: refactor code that fetches leftover tagsJunio C Hamano2013-08-071-5/+9
| * | | | | | | | | fetch: refactor code that prepares a transportJunio C Hamano2013-08-071-20/+26
| * | | | | | | | | fetch: rename file-scope global "transport" to "gtransport"Junio C Hamano2013-08-071-11/+11
| * | | | | | | | | t5802: add test for connect helperJunio C Hamano2013-08-071-0/+72
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sp/clip-read-write-to-8mb' into maintJunio C Hamano2013-09-186-27/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"sp/clip-read-write-to-8mbSteffen Prohaska2013-08-204-27/+0
| * | | | | | | | | xread, xwrite: limit size of IO to 8MBSteffen Prohaska2013-08-202-0/+26
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/mailmap-incomplete-line' into maintJunio C Hamano2013-09-182-13/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mailmap: handle mailmap blobs without trailing newlinesjk/mailmap-incomplete-lineJeff King2013-08-282-13/+24
* | | | | | | | | | t7406-submodule-update: add missing &&Tay Ray Chuan2013-09-171-1/+1
* | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2013-09-111-11/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | l10n: de.po: use "das Tag" instead of "der Tag"Ralf Thielow2013-09-081-11/+11
* | | | | | | | | | | Merge branch 'nd/fetch-pack-shallow-fix' into maintJunio C Hamano2013-09-052-1/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch-pack: do not remove .git/shallow file when --depth is not specifiednd/fetch-pack-shallow-fixNguyễn Thái Ngọc Duy2013-08-252-1/+19
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'hv/config-from-blob' into maintJunio C Hamano2013-09-051-16/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: do not use C function names as struct membershv/config-from-blobJeff King2013-08-261-16/+16
* | | | | | | | | | | | Merge branch 'maint-1.8.3' into maintJunio C Hamano2013-09-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.2' into maint-1.8.3maint-1.8.3Junio C Hamano2013-09-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Documentation/git-merge.txt: fix formatting of example blockmaint-1.8.2Andreas Schwab2013-09-051-2/+2
* | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-po into maintJunio C Hamano2013-09-032-718/+874
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |