summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* entry.c: fix possible buffer overflow in remove_subtree()mh/remove-subtree-long-pathname-fixMichael Haggerty2014-03-131-17/+17
* checkout_entry(): use the strbuf throughout the functionMichael Haggerty2014-03-131-16/+16
* entry.c: convert checkout_entry to use strbufNguyễn Thái Ngọc Duy2013-10-241-5/+8
* git-merge: document the -S optionNicolas Vigier2013-10-181-1/+5
* Start preparing for 1.8.4.2Junio C Hamano2013-10-172-1/+51
* Merge branch 'jk/upload-pack-keepalive' into maintJunio C Hamano2013-10-172-1/+35
|\
| * upload-pack: bump keepalive default to 5 secondsjk/upload-pack-keepaliveJeff King2013-09-092-2/+2
| * upload-pack: send keepalive packets during pack computationJeff King2013-09-092-1/+35
* | Merge branch 'bc/http-backend-allow-405' into maintJunio C Hamano2013-10-171-2/+4
|\ \
| * | http-backend: provide Allow header for 405bc/http-backend-allow-405Brian M. Carlson2013-09-121-2/+4
* | | Merge branch 'jc/cvsserver-perm-bit-fix' into maintJunio C Hamano2013-10-171-1/+1
|\ \ \
| * | | cvsserver: pick up the right mode bitsjc/cvsserver-perm-bit-fixJunio C Hamano2013-09-111-1/+1
* | | | Merge branch 'js/add-i-mingw' into maintJunio C Hamano2013-10-171-1/+1
|\ \ \ \
| * | | | add--interactive: fix external command invocation on Windowsjs/add-i-mingwJohannes Sixt2013-09-041-1/+1
* | | | | Merge branch 'nd/git-dir-pointing-at-gitfile' into maintJunio C Hamano2013-10-172-5/+8
|\ \ \ \ \
| * | | | | Make setup_git_env() resolve .git file when $GIT_DIR is not specifiednd/git-dir-pointing-at-gitfileNguyễn Thái Ngọc Duy2013-09-032-5/+8
* | | | | | Merge branch 'jk/has-sha1-file-retry-packed' into maintJunio C Hamano2013-10-171-1/+4
|\ \ \ \ \ \
| * | | | | | has_sha1_file: re-check pack directory before giving upjk/has-sha1-file-retry-packedJeff King2013-08-301-1/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-172-1/+18
|\ \ \ \ \ \
| * | | | | | commit: search author pattern against mailmapap/commit-author-mailmapAntoine Pelisse2013-08-242-1/+18
* | | | | | | Merge branch 'es/rebase-i-no-abbrev' into maintJunio C Hamano2013-10-172-2/+117
|\ \ \ \ \ \ \
| * | | | | | | rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrevJunio C Hamano2013-08-252-1/+31
| * | | | | | | t3404: rebase -i: demonstrate short SHA-1 collisionEric Sunshine2013-08-251-0/+24
| * | | | | | | t3404: make tests more self-containedEric Sunshine2013-08-251-2/+63
* | | | | | | | Merge branch 'rt/rebase-p-no-merge-summary' into maintJunio C Hamano2013-10-172-1/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summaryRalf Thielow2013-08-212-1/+25
* | | | | | | | | Merge branch 'es/rebase-i-respect-core-commentchar' into maintJunio C Hamano2013-10-171-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase -i: fix cases ignoring core.commentchares/rebase-i-respect-core-commentcharEric Sunshine2013-08-181-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | t4254: modernize testsSZEDER Gábor2013-10-171-21/+15
* | | | | | | | | 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
View Lorry Controller Status