summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.5.3v1.7.5.3Junio C Hamano2011-05-264-3/+36
* Merge branch 'maint-1.7.4' into maintJunio C Hamano2011-05-260-0/+0
|\
| * Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-264-14/+67
| |\
| * \ Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-261-2/+7
| |\ \
| * \ \ Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4Junio C Hamano2011-05-261-12/+11
| |\ \ \
* | \ \ \ Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2011-05-262-2/+36
|\ \ \ \ \
| * | | | | do not read beyond end of malloc'd bufferJim Meyering2011-05-202-2/+36
* | | | | | Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano2011-05-261-9/+9
|\ \ \ \ \ \
| * | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT*Johannes Sixt2011-05-091-9/+9
| * | | | | | Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...Junio C Hamano2011-05-091-10/+9
| * | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdirKacper Kornet2011-04-281-9/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mg/diff-uiconfig-doc' into maintJunio C Hamano2011-05-262-12/+30
|\ \ \ \ \ \
| * | | | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diffMichael J Gruber2011-04-272-12/+30
* | | | | | | Merge branch 'ft/gitweb-tar-with-gzip-n' into maintJunio C Hamano2011-05-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | gitweb: supply '-n' to gzip for identical outputFraser Tweedale2011-04-261-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'ss/doc-svn' into maintJunio C Hamano2011-05-261-9/+7
|\ \ \ \ \ \ \
| * | | | | | | remove noise and inaccuracies from git-svn docsStefan Sperling2011-04-191-9/+7
* | | | | | | | Merge branch 'jn/format-patch-doc' into maintJunio C Hamano2011-05-264-195/+229
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/format-patch: suggest Toggle Word Wrap add-on for ThunderbirdJohannes Sixt2011-04-191-4/+14
| * | | | | | | | Documentation: publicize hints for sending patches with GMailJonathan Nieder2011-04-154-55/+61
| * | | | | | | | Documentation: publicize KMail hints for sending patches inlineJonathan Nieder2011-04-152-20/+18
| * | | | | | | | Documentation: hints for sending patches inline with ThunderbirdJonathan Nieder2011-04-152-80/+84
| * | | | | | | | Documentation: explain how to check for patch corruptionJonathan Nieder2011-04-152-44/+60
| * | | | | | | | Merge v1.7.5-rc2 into jn/format-patch-docJunio C Hamano2011-04-15431-4909/+12524
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maintJunio C Hamano2011-05-262-52/+45
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+45
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+45
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | setup_revisions(): take pathspec from command line and --stdin correctlyJunio C Hamano2011-05-112-52/+45
* | | | | | | | | | | | | Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano2011-05-263-7/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t3503: test cherry picking and reverting root commitsJeff King2011-05-161-2/+25
| * | | | | | | | | | | | | revert: allow reverting a root commitJeff King2011-05-161-3/+1
| * | | | | | | | | | | | | cherry-pick: handle root commits with external strategiesJeff King2011-05-161-2/+10
* | | | | | | | | | | | | | Merge branch 'rg/copy-gecos-username' into maintJunio C Hamano2011-05-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | copy_gecos: fix not adding nlen to len when processing "&"Rafael Gieschke2011-05-171-0/+1
* | | | | | | | | | | | | | | Merge branch 'fc/completion-zsh' into maintJunio C Hamano2011-05-261-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-completion: fix regression in zsh supportFelipe Contreras2011-05-101-0/+8
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-264-14/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | test core.gitproxy configurationJeff King2011-05-181-0/+43
| * | | | | | | | | | | | | | send-pack: avoid deadlock on git:// push with failed pack-objectsJeff King2011-05-161-0/+2
| * | | | | | | | | | | | | | connect: let callers know if connection is a socketJeff King2011-05-162-1/+7
| * | | | | | | | | | | | | | connect: treat generic proxy processes like ssh processesJeff King2011-05-161-13/+15
* | | | | | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maintJunio C Hamano2011-05-261-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | sideband_demux(): fix decl-after-stmtJunio C Hamano2011-05-161-2/+2
| * | | | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | send-pack: unbreak push over stateless rpcJeff King2011-05-051-1/+2
| * | | | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-04-251-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | send-pack: avoid deadlock when pack-object dies earlyJohannes Sixt2011-04-251-0/+4
* | | | | | | | | | | | | | | Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maintJunio C Hamano2011-05-261-104/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert "t0081 (line-buffer): add buffering tests"Jonathan Nieder2011-03-301-104/+2
View Lorry Controller Status