summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hm/maint-imap-send-crlf'Junio C Hamano2010-02-211-1/+39
|\
| * git-imap-send: Convert LF to CRLF before storing patch to draft boxHitoshi Mitake2010-02-121-1/+39
* | Merge branch 'sp/push-sideband'Junio C Hamano2010-02-2110-134/+370
|\ \
| * \ Merge branch 'sp/maint-push-sideband' into sp/push-sidebandJunio C Hamano2010-02-102-45/+81
| |\ \
| | * | receive-pack: Send internal errors over side-band #2Shawn O. Pearce2010-02-102-15/+52
| | * | t5401: Use a bare repository for the remote peerShawn O. Pearce2010-02-091-29/+29
| * | | Merge branch 'sp/maint-push-sideband' into sp/push-sidebandJunio C Hamano2010-02-0511-90/+290
| |\ \ \ | | |/ /
| | * | receive-pack: Send hook output over side band #2Shawn O. Pearce2010-02-052-17/+70
| | * | receive-pack: Wrap status reports inside side-band-64kShawn O. Pearce2010-02-051-8/+22
| | * | receive-pack: Refactor how capabilities are shown to the clientShawn O. Pearce2010-02-051-10/+8
| | * | send-pack: demultiplex a sideband stream with status dataShawn O. Pearce2010-02-051-16/+50
| | * | run-command: support custom fd-set in asyncErik Faye-Lund2010-02-057-37/+131
| | * | run-command: Allow stderr to be a caller supplied pipeShawn O. Pearce2010-02-053-2/+10
* | | | Merge branch 'jc/checkout-detached'Junio C Hamano2010-02-215-12/+46
|\ \ \ \
| * | | | Reword "detached HEAD" notificationJunio C Hamano2010-01-295-12/+46
* | | | | Merge branch 'jc/maint-fix-test-perm'Junio C Hamano2010-02-212-0/+4
|\ \ \ \ \
| * | | | | lib-patch-mode.sh: Fix permissionJunio C Hamano2010-01-301-0/+2
| * | | | | Merge commit 'b319ef7' into jc/maint-fix-test-permJunio C Hamano2010-01-301466-52463/+223107
| |\ \ \ \ \
| * | | | | | t6000lib: Fix permissionJunio C Hamano2010-01-301-0/+2
* | | | | | | Merge branch 'jn/makefile-script-lib'Junio C Hamano2010-02-213-14/+28
|\ \ \ \ \ \ \
| * | | | | | | Do not install shell libraries executableJonathan Nieder2010-01-313-14/+28
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'mv/request-pull-modernize'Junio C Hamano2010-02-211-4/+4
|\ \ \ \ \ \ \
| * | | | | | | request-pull: avoid mentioning that the start point is a single commitMiklos Vajna2010-01-291-4/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2010-02-203-14/+13
|\ \ \ \ \ \ \
| * | | | | | | git-p4: fix bug in symlink handlingEvan Powers2010-02-201-3/+2
| * | | | | | | t1450: fix testcases that were wrongly expecting failureThomas Rast2010-02-191-8/+8
| * | | | | | | Documentation: Fix indentation problem in git-commit(1)Jacob Helwig2010-02-191-3/+3
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-197-29/+45
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'jk/maint-rmdir-fix' into maintJunio C Hamano2010-02-192-1/+9
| |\ \ \ \ \ \ \
| | * | | | | | | rm: fix bug in recursive subdirectory removalJeff King2010-02-182-1/+9
| * | | | | | | | Documentation: describe --thin more accuratelyStephen Boyd2010-02-185-28/+36
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-1710-36/+39
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | docs: don't talk about $GIT_DIR/refs/ everywhereJeff King2010-02-1710-36/+39
* | | | | | | | | Merge branch 'np/fast-import-idx-v2'Junio C Hamano2010-02-172-95/+84
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-import: use the diff_delta() max_delta_size argumentNicolas Pitre2010-02-171-6/+2
| * | | | | | | | | fast-import: honor pack.indexversion and pack.packsizelimit config varsNicolas Pitre2010-02-171-0/+11
| * | | | | | | | | fast-import: make default pack size unlimitedNicolas Pitre2010-02-172-10/+7
| * | | | | | | | | fast-import: use write_idx_file() instead of custom codeNicolas Pitre2010-02-171-46/+17
| * | | | | | | | | fast-import: use sha1write() for pack dataNicolas Pitre2010-02-171-10/+25
| * | | | | | | | | fast-import: start using struct pack_idx_entryNicolas Pitre2010-02-171-29/+28
* | | | | | | | | | Update draft release notes to 1.7.1Junio C Hamano2010-02-171-1/+4
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Update 1.7.0.1 release notesJunio C Hamano2010-02-171-1/+1
| * | | | | | | | | Merge branch 'jk/cherry-pick-reword' into maintJunio C Hamano2010-02-171-23/+19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-double-dash' into maintJunio C Hamano2010-02-172-0/+43
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/typo' into maintJunio C Hamano2010-02-1717-19/+20
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | gitweb: Protect escaping functions against calling on undefJakub Narebski2010-02-171-1/+8
* | | | | | | | | | | | | gitweb: esc_html (short) error message in die_errorJakub Narebski2010-02-171-2/+2
* | | | | | | | | | | | | Merge branch 'jc/typo'Junio C Hamano2010-02-1617-19/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Typofixes outside documentation areaJunio C Hamano2010-02-0317-19/+20