summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* builtin-diff: fix comparison between two blobs.Junio C Hamano2006-05-151-3/+5
* Merge branch 'lt/oneway'Junio C Hamano2006-05-152-48/+17
|\
| * read-tree --reset -u fix.Linus Torvalds2006-05-151-4/+12
| * read-tree -u one-way merge fix to check out locally modified paths.Junio C Hamano2006-05-151-0/+3
| * Simplify "git reset --hard"Linus Torvalds2006-05-141-46/+4
| * Allow one-way tree merge to remove old filesLinus Torvalds2006-05-141-1/+1
* | Merge branch 'ew/send-email'Junio C Hamano2006-05-151-23/+52
|\ \
| * | send-email: quiet some warnings, reject invalid addressesEric Wong2006-05-151-3/+12
| * | send-email: allow sendmail binary to be used instead of SMTPEric Wong2006-05-151-20/+40
* | | Merge branch 'lt/config'Junio C Hamano2006-05-151-1/+0
|\ \ \
| * \ \ Merge branch 'lt/fix-config' into lt/configJunio C Hamano2006-05-135-24/+93
| |\ \ \
* | \ \ \ Merge branch 'jc/grep'Junio C Hamano2006-05-155-24/+951
|\ \ \ \ \
| * | | | | Fix silly typo in new builtin grepLinus Torvalds2006-05-151-1/+1
| * | | | | builtin-grep: unparse more command line options.Junio C Hamano2006-05-151-8/+57
| * | | | | builtin-grep: use external grep when we can take advantage of itLinus Torvalds2006-05-141-0/+79
| * | | | | builtin-grep: -F (--fixed-strings)Junio C Hamano2006-05-092-5/+33
| * | | | | builtin-grep: -w fixJunio C Hamano2006-05-091-3/+3
| * | | | | builtin-grep: typofixJunio C Hamano2006-05-091-1/+1
| * | | | | builtin-grep: tighten argument parsing.Junio C Hamano2006-05-081-26/+50
| * | | | | builtin-grep: documentationJunio C Hamano2006-05-081-23/+62
| * | | | | Teach -f <file> option to builtin-grep.Junio C Hamano2006-05-081-19/+42
| * | | | | builtin-grep: -L (--files-without-match).Junio C Hamano2006-05-031-0/+20
| * | | | | builtin-grep: binary files -a and -IJunio C Hamano2006-05-031-0/+44
| * | | | | builtin-grep: terminate correctly at EOFJunio C Hamano2006-05-031-0/+2
| * | | | | builtin-grep: tighten path wildcard vs tree traversal.Junio C Hamano2006-05-021-15/+20
| * | | | | builtin-grep: support -w (--word-regexp).Junio C Hamano2006-05-021-0/+30
| * | | | | builtin-grep: support -c (--count).Junio C Hamano2006-05-021-1/+20
| * | | | | builtin-grep: allow more than one patterns.Junio C Hamano2006-05-021-21/+51
| * | | | | builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.Junio C Hamano2006-05-021-6/+22
| * | | | | builtin-grep: printf %.*s length is int, not ptrdiff_t.Junio C Hamano2006-05-021-1/+1
| * | | | | builtin-grep: do not use setup_revisions()Junio C Hamano2006-05-011-121/+134
| * | | | | builtin-grep: support '-l' option.Junio C Hamano2006-05-011-0/+10
| * | | | | builtin-grep: wildcard pathspec fixesJunio C Hamano2006-05-011-23/+62
| * | | | | built-in "git grep"Junio C Hamano2006-05-014-1/+457
* | | | | | Merge branch 'lt/diff'Junio C Hamano2006-05-153-1/+53
|\ \ \ \ \ \
| * | | | | | git diff: support "-U" and "--unified" options properlyLinus Torvalds2006-05-143-1/+53
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix'Junio C Hamano2006-05-156-26/+96
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix pack-index issue on 64-bit platforms a bit more portably.v1.3.3Junio C Hamano2006-05-152-4/+2
| * | | | | Install git-send-email by defaultEric Wong2006-05-152-7/+4
| * | | | | Fix compilation on newer NetBSD systemsDennis Stosberg2006-05-151-1/+3
| * | | | | Merge branch 'fix' into maintJunio C Hamano2006-05-151-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix' into maintJunio C Hamano2006-05-142-0/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | git config syntax updatesLinus Torvalds2006-05-133-20/+90
| * | | | | | Another config file parsing fix.sean2006-05-131-1/+3
| * | | | | | checkout: use --aggressive when running a 3-way merge (-m).Junio C Hamano2006-05-131-1/+1
* | | | | | | Merge branch 'fix'Junio C Hamano2006-05-151-0/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Ensure author & committer before asking for commit message.Sean2006-05-141-0/+2
| | |/ / / / | |/| | | |
* | | | | | Install git-send-email by defaultEric Wong2006-05-142-7/+4
* | | | | | send-email: address expansion for common mailersEric Wong2006-05-141-0/+48
* | | | | | diffstat rename squashing fix.Junio C Hamano2006-05-141-2/+7
| |_|/ / / |/| | | |