summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2010-02-285-24/+31
|\
| * Git 1.7.0.1v1.7.0.1Junio C Hamano2010-02-283-7/+12
| * Remove reference to GREP_COLORS from documentationMark Lodato2010-02-281-3/+1
| * sha1_name: fix segfault caused by invalid index accessMarkus Heidelberg2010-02-281-14/+18
* | git svn: delay importing SVN::Base until it is neededjosh robb2010-02-261-5/+11
* | git-svn: Fix discarding of extra parents from svn:mergeinfoTuomas Suutari2010-02-262-2/+2
* | t9151: Add two new svn:mergeinfo test casesTuomas Suutari2010-02-263-53/+581
* | t9151: Fix a few commits in the SVN dumpTuomas Suutari2010-02-262-38/+74
* | Merge branch 'maint'Junio C Hamano2010-02-251-0/+1
|\ \ | |/
| * Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-02-251-0/+1
| |\
| | * t3301-notes: insert a shbang line in ./fake_editor.shJohannes Sixt2010-02-251-0/+1
* | | Windows: redirect f[re]open("/dev/null") to f[re]open("nul")Johannes Sixt2010-02-254-0/+33
* | | Merge branch 'maint'Junio C Hamano2010-02-241-1/+1
|\ \ \ | |/ /
| * | commit: quote the user name in the exampleMatt Kraai2010-02-241-1/+1
| * | Merge branch 'ml/maint-grep-doc' into maintJunio C Hamano2010-02-241-5/+12
| |\ \
* | \ \ Merge branch 'maint'Junio C Hamano2010-02-233-6/+9
|\ \ \ \ | |/ / /
| * | | am: remove rebase-apply directory before gcJonathan Nieder2010-02-231-2/+1
| * | | rerere: fix memory leak if rerere images can't be readBert Wesarg2010-02-231-3/+6
| * | | Documentation: mention conflict marker size argument (%L) for merge driverBert Wesarg2010-02-231-1/+2
* | | | Merge branch 'ml/maint-grep-doc'Junio C Hamano2010-02-211-5/+12
|\ \ \ \ | | |/ / | |/| |
| * | | grep documentation: clarify what files matchMark Lodato2010-02-161-5/+12
* | | | Merge branch 'tc/maint-transport-ls-remote-with-void'Junio C Hamano2010-02-212-1/+10
|\ \ \ \
| * | | | transport: add got_remote_refs flagTay Ray Chuan2010-02-162-1/+10
* | | | | 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