summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | http-backend: Don't infinite loop during die()Shawn O. Pearce2010-03-241-7/+11
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/imap-send-unconfuse-from-line'Junio C Hamano2010-04-032-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | imap-send: Remove limitation on message bodyRamkumar Ramachandra2010-03-242-8/+10
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'mg/use-default-abbrev-length-in-rev-list'Junio C Hamano2010-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | rev-list: use default abbrev length when abbrev-commit is in effectMichael J Gruber2010-03-241-1/+1
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'mg/maint-send-email-lazy-editor'Junio C Hamano2010-04-031-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | send-email: lazily assign editor variableMichael J Gruber2010-03-251-1/+4
* | | | | | | | | | | | | | | | | | | | Merge branch 'rb/maint-python-path'Junio C Hamano2010-04-035-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Correct references to /usr/bin/python which does not exist on FreeBSDR. Tyler Ballance2010-03-245-4/+9
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-0315-79/+405
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | merge-recursive: add a label for ancestorJonathan Nieder2010-03-201-0/+1
| * | | | | | | | | | | | | | | | | | | cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-202-3/+6
| * | | | | | | | | | | | | | | | | | | revert: clarify label on conflict hunksJonathan Nieder2010-03-202-41/+64
| * | | | | | | | | | | | | | | | | | | compat: add mempcpy()Jonathan Nieder2010-03-201-0/+9
| * | | | | | | | | | | | | | | | | | | checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-202-1/+2
| * | | | | | | | | | | | | | | | | | | merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-202-3/+9
| * | | | | | | | | | | | | | | | | | | merge_file(): add comment explaining behavior wrt conflict styleJonathan Nieder2010-03-201-0/+6
| * | | | | | | | | | | | | | | | | | | checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-202-3/+3
| * | | | | | | | | | | | | | | | | | | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-206-15/+17
| * | | | | | | | | | | | | | | | | | | merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-202-2/+3
| * | | | | | | | | | | | | | | | | | | xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-204-13/+20
| * | | | | | | | | | | | | | | | | | | xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2010-03-202-2/+15
| * | | | | | | | | | | | | | | | | | | tests: document cherry-pick behavior in face of conflictsJonathan Nieder2010-03-201-0/+198
| * | | | | | | | | | | | | | | | | | | tests: document format of conflicts from checkout -mJonathan Nieder2010-03-201-4/+61
* | | | | | | | | | | | | | | | | | | | Merge branch 'ef/cherry-abbrev'Junio C Hamano2010-04-033-27/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | ls: remove redundant logicErik Faye-Lund2010-03-212-9/+4
| * | | | | | | | | | | | | | | | | | | | cherry: support --abbrev optionErik Faye-Lund2010-03-211-18/+21
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'bw/template-tool-buildconfig'Junio C Hamano2010-04-039-23/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Modernize git calling conventions in hook templatesBen Walton2010-03-207-17/+17
| * | | | | | | | | | | | | | | | | | | | Make templates honour SHELL_PATH and PERL_PATHBen Walton2010-03-204-6/+19
* | | | | | | | | | | | | | | | | | | | | 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