summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/mailmap-update'Junio C Hamano2010-04-031-0/+3
|\
| * .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" ShukelaMichael J Gruber2010-03-201-0/+3
* | Merge branch 'bc/t5505-fix'Junio C Hamano2010-04-031-41/+6
|\ \
| * | t/t5505-remote.sh: escape * to prevent interpretation by shell as globBrandon Casey2010-03-201-1/+1
| * | t5505: add missing &&Brandon Casey2010-03-201-1/+1
| * | t5505: remove unnecessary subshell invocationsBrandon Casey2010-03-201-39/+4
* | | Merge branch 'gh/maint-stash-show-error-message'Junio C Hamano2010-04-031-2/+6
|\ \ \
| * | | Improve error messages from 'git stash show'Gustaf Hendeby2010-03-161-2/+6
* | | | Merge branch 'rs/threaded-grep-context'Junio C Hamano2010-04-032-14/+19
|\ \ \ \
| * | | | grep: enable threading for context line printingRené Scharfe2010-03-152-14/+18
* | | | | Merge branch 'bc/maint-daemon-sans-ss-family'Junio C Hamano2010-04-031-4/+7
|\ \ \ \ \
| * | | | | daemon.c: avoid accessing ss_family member of struct sockaddr_storageBrandon Casey2010-03-161-4/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'bc/acl-test'Junio C Hamano2010-04-031-17/+6
|\ \ \ \ \
| * | | | | t/t1304: make a second colon optional in the mask ACL checkBrandon Casey2010-03-161-1/+1
| * | | | | t/t1304: set the ACL effective rights maskBrandon Casey2010-03-161-0/+1
| * | | | | t/t1304: use 'test -r' to test readability rather than looking at mode bitsBrandon Casey2010-03-161-14/+1
| * | | | | t/t1304: set the Default ACL base entriesBrandon Casey2010-03-161-0/+1
| * | | | | t/t1304: avoid -d option to setfaclBrandon Casey2010-03-161-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'ja/send-email-ehlo'Junio C Hamano2010-04-031-3/+77
|\ \ \ \ \
| * | | | | git-send-email.perl - try to give real name of the calling host to HELO/EHLOJari Aalto2010-03-141-1/+67
| * | | | | git-send-email.perl: add option --smtp-debugJari Aalto2010-03-141-2/+7
| * | | | | git-send-email.perl: improve error message in send_message()Jari Aalto2010-03-141-1/+4
* | | | | | Merge branch 'do/rebase-i-arbitrary'Junio C Hamano2010-04-032-2/+9
|\ \ \ \ \ \
| * | | | | | rebase--interactive: don't require what's rebased to be a branchDave Olszewski2010-03-142-2/+9
* | | | | | | Merge branch 'ak/everyday-git'Junio C Hamano2010-04-031-47/+4
|\ \ \ \ \ \ \
| * | | | | | | everyday: fsck and gc are not everyday operationsAnders Kaseorg2010-03-161-47/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Makefile: future-proof Cygwin version checkJonathan Nieder2010-04-031-1/+1
* | | | | | | Fix _XOPEN_SOURCE problem on DragonFlyYONETANI Tomokazu2010-04-021-1/+2
* | | | | | | builtin/commit: remove unnecessary variable definitionMarkus Heidelberg2010-04-021-1/+1
* | | | | | | builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg2010-04-021-2/+2
* | | | | | | Integrate version 3 ciabot scripts into contrib/.Eric Raymond2010-04-023-0/+426
* | | | | | | Makefile: update defaults for modern CygwinEric Blake2010-04-011-10/+12
* | | | | | | Sync with 1.7.0.4Junio C Hamano2010-03-3111-17/+51
|\ \ \ \ \ \ \
| * | | | | | | Git 1.7.0.4v1.7.0.4Junio C Hamano2010-03-313-4/+13
| * | | | | | | Merge branch 'jc/maint-refs-dangling' into maintJunio C Hamano2010-03-312-7/+10
| |\ \ \ \ \ \ \
| * | | | | | | | Documentation: show-ref <pattern>s are optionalHolger Weiß2010-03-311-1/+1
| * | | | | | | | Link against libiconv on IRIXHolger Weiß2010-03-311-0/+2
| * | | | | | | | Don't redefine htonl and ntohl on big-endianHolger Weiß2010-03-311-0/+2
| * | | | | | | | gitweb: git_get_project_config requires only $git_dir, not also $projectJakub Narebski2010-03-311-2/+1
| * | | | | | | | Updated the usage string of git resetJan Stępień2010-03-311-1/+2
| * | | | | | | | Documentation: Clarify support for smart HTTP backendGreg Bacon2010-03-301-1/+1
| * | | | | | | | Windows: fix utime() for read-only filesJohannes Sixt2010-03-301-2/+18
| * | | | | | | | diff: fix textconv error zombiesJohannes Sixt2010-03-301-6/+11
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-03-292-1/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2010-03-292-1/+12
* | | | | | | | | Update draft release notes to 1.7.1Junio C Hamano2010-03-281-9/+10
* | | | | | | | | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-288-18/+168
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revert: fix tiny memory leak in cherry-pick --ffJonathan Nieder2010-03-201-1/+2
| * | | | | | | | | rebase -i: use new --ff cherry-pick optionChristian Couder2010-03-201-12/+3
| * | | | | | | | | Documentation: describe new cherry-pick --ff optionChristian Couder2010-03-061-1/+5