summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2010-11-243-3/+5
|\
| * Merge branch 'jl/maint-pull-tags-doc' into maintJunio C Hamano2010-11-241-0/+2
| |\
| * \ Merge branch 'kb/maint-diff-ws-check' into maintJunio C Hamano2010-11-244-47/+118
| |\ \
| * \ \ Merge branch 'jm/mailmap' into maintJunio C Hamano2010-11-242-16/+61
| |\ \ \
| * \ \ \ Merge branch 'tr/maint-git-repack-tmpfile' into maintJunio C Hamano2010-11-241-2/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-242-1/+32
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jn/send-pack-error' into maintJunio C Hamano2010-11-241-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ak/submodule-sync' into maintJunio C Hamano2010-11-242-3/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-244-6/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano2010-11-243-25/+124
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/no-textconv-symlink' into maintJunio C Hamano2010-11-242-3/+34
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/maint-blame-el' into maintJunio C Hamano2010-11-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/git-p4-deletion' into maintJunio C Hamano2010-11-241-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kf/post-receive-sample-hook' into maintJunio C Hamano2010-11-241-16/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repack-reuse-object' into maintJunio C Hamano2010-11-243-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/fix-cherry-pick-root' into maintJunio C Hamano2010-11-242-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'uk/fix-author-ident-sed-script' into maintJunio C Hamano2010-11-241-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/makefile-track-cc' into maintJunio C Hamano2010-11-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/reset-doc' into maintJunio C Hamano2010-11-241-29/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/send-email-refuse-sending-unedited-cover-letter' into maintJunio C Hamano2010-11-242-0/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | imap-send: link against libcrypto for HMAC and othersDiego Elio Pettenò2010-11-241-1/+1
| * | | | | | | | | | | | | | | | | | | | git-send-email.perl: Deduplicate "to:" and "cc:" entries with namesJoe Perches2010-11-241-1/+1
| * | | | | | | | | | | | | | | | | | | | mingw: do not set errno to 0 on successErik Faye-Lund2010-11-231-1/+3
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ef/mingw-daemon'Junio C Hamano2010-11-2312-231/+1117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | daemon: opt-out on features that require posixErik Faye-Lund2010-11-042-29/+73
| * | | | | | | | | | | | | | | | | | | | | daemon: make --inetd and --detach incompatibleErik Faye-Lund2010-11-042-5/+6
| * | | | | | | | | | | | | | | | | | | | | daemon: use socklen_tErik Faye-Lund2010-11-041-3/+3
| * | | | | | | | | | | | | | | | | | | | | mingw: use poll-emulation from gnulibErik Faye-Lund2010-11-045-81/+6
| * | | | | | | | | | | | | | | | | | | | | mingw: import poll-emulation from gnulibErik Faye-Lund2010-11-042-0/+650
| * | | | | | | | | | | | | | | | | | | | | daemon: get remote host address from root-processErik Faye-Lund2010-11-041-40/+39
| * | | | | | | | | | | | | | | | | | | | | Improve the mingw getaddrinfo stub to handle more use casesMartin Storsjö2010-11-041-7/+21
| * | | | | | | | | | | | | | | | | | | | | daemon: use full buffered mode for stderrErik Faye-Lund2010-11-041-2/+4
| * | | | | | | | | | | | | | | | | | | | | daemon: use run-command api for async servingErik Faye-Lund2010-11-041-46/+47
| * | | | | | | | | | | | | | | | | | | | | mingw: add kill emulationErik Faye-Lund2010-11-042-0/+22
| * | | | | | | | | | | | | | | | | | | | | mingw: support waitpid with pid > 0 and WNOHANGErik Faye-Lund2010-11-042-0/+9
| * | | | | | | | | | | | | | | | | | | | | mingw: use real pidErik Faye-Lund2010-11-042-8/+75
| * | | | | | | | | | | | | | | | | | | | | inet_ntop: fix a couple of old-style declsErik Faye-Lund2010-11-041-13/+3
| * | | | | | | | | | | | | | | | | | | | | compat: add inet_pton and inet_ntop prototypesMike Pape2010-11-044-6/+18
| * | | | | | | | | | | | | | | | | | | | | mingw: implement syslogMike Pape2010-11-045-4/+96
| * | | | | | | | | | | | | | | | | | | | | mingw: add network-wrappers for daemonMike Pape2010-11-042-1/+59
* | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.4Junio C Hamano2010-11-171-2/+53
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jl/maint-pull-tags-doc'Junio C Hamano2010-11-171-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | pull: Remove --tags option from manpageJens Lehmann2010-11-031-0/+2
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/maint-submodule-savearg'Junio C Hamano2010-11-172-12/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | submodule: only preserve flags across recursive status/update invocationsKevin Ballard2010-11-032-11/+42
| * | | | | | | | | | | | | | | | | | | | | | submodule: preserve all arguments exactly when recursingKevin Ballard2010-11-032-4/+20
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/missing-config'Junio C Hamano2010-11-172-3/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | config: treat non-existent config files as emptyJeff King2010-10-212-3/+30
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/maint-diff-ws-check'Junio C Hamano2010-11-174-47/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | diff: handle lines containing only whitespace and tabs betterKevin Ballard2010-10-202-3/+41