summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano2006-05-175-31/+88
* Remove old "git-grep.sh" remnantsLinus Torvalds2006-05-162-64/+3
* Merge branch 'maint'Junio C Hamano2006-05-162-7/+20
|\
| * merge-base: Clarify the comments on post processing.Junio C Hamano2006-05-161-3/+6
| * Update the documentation for git-merge-baseFredrik Kuivinen2006-05-151-4/+14
* | Merge branch 'np/pack'Junio C Hamano2006-05-162-13/+16
|\ \
| * | improve depth heuristic for maximum delta sizeNicolas Pitre2006-05-161-2/+5
| * | pack-object: slightly more efficientNicolas Pitre2006-05-152-7/+10
| * | simple euristic for further free packing improvementsNicolas Pitre2006-05-151-5/+2
* | | Merge branch 'se/tag'Junio C Hamano2006-05-151-5/+3
|\ \ \
| * | | Strip useless "tags/" prefix from git-tag -l outputSean2006-05-151-5/+3
* | | | Merge branch 'se/rev-parse'Junio C Hamano2006-05-155-7/+48
|\ \ \ \ | |/ / /
| * | | Add "--branches", "--tags" and "--remotes" options to git-rev-parse.Sean2006-05-145-7/+48
* | | | Merge branch 'se/diff'Junio C Hamano2006-05-156-6/+96
|\ \ \ \
| * | | | Convert some "apply --summary" users to "diff --summary".Sean2006-05-143-4/+3
| * | | | Add "--summary" option to git diff.Sean2006-05-143-2/+93
| |/ / /
* | | | Merge branch 'se/rebase'Junio C Hamano2006-05-153-13/+30
|\ \ \ \
| * | | | Make git rebase interactive help match documentation.Sean2006-05-143-13/+30
| |/ / /
* | | | 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