summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/branch-del-symref'Jeff King2012-10-291-26/+49
|\
| * branch: show targets of deleted symrefs, not sha1sRené Scharfe2012-10-181-8/+11
| * branch: skip commit checks when deleting symref branchesRené Scharfe2012-10-181-2/+8
| * branch: delete symref branch, not its targetRené Scharfe2012-10-181-1/+1
| * branch: factor out delete_branch_config()René Scharfe2012-10-181-5/+10
| * branch: factor out check_branch_commit()René Scharfe2012-10-181-12/+21
* | Merge branch 'nd/status-long'Jeff King2012-10-291-6/+23
|\ \
| * | status: add --long output format optionJeff King2012-10-181-6/+23
| |/
* | Merge branch 'nd/grep-true-path'Jeff King2012-10-291-13/+18
|\ \
| * | grep: stop looking at random places for .gitattributesNguyễn Thái Ngọc Duy2012-10-121-13/+18
| * | Merge branch 'os/commit-submodule-ignore' into maintJunio C Hamano2012-10-081-0/+1
| |\ \
| * \ \ Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maintJunio C Hamano2012-10-081-4/+31
| |\ \ \
| * \ \ \ Merge branch 'rt/maint-clone-single' into maintJunio C Hamano2012-10-081-14/+51
| |\ \ \ \
| * \ \ \ \ Merge branch 'lt/mailinfo-handle-attachment-more-sanely' into maintJunio C Hamano2012-10-081-11/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/grep-pcre-loose-ends'Jeff King2012-10-292-125/+16
|\ \ \ \ \ \ \
| * | | | | | | log: honor grep.* configurationJunio C Hamano2012-10-091-1/+7
| * | | | | | | grep: move pattern-type bits support to top-level grep.[ch]Junio C Hamano2012-10-091-39/+1
| * | | | | | | grep: move the configuration parsing logic to grep.[ch]Junio C Hamano2012-10-091-131/+0
| * | | | | | | builtin/grep.c: make configuration callback more reusableJunio C Hamano2012-10-091-25/+79
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jl/submodule-rm'Jeff King2012-10-291-15/+110
|\ \ \ \ \ \ \
| * | | | | | | submodule: teach rm to remove submodules unless they contain a git directoryJens Lehmann2012-09-291-15/+110
* | | | | | | | Merge branch 'jk/peel-ref'Jeff King2012-10-253-22/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | peel_ref: do not return a null sha1Jeff King2012-10-043-22/+4
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'jc/maint-log-grep-all-match-1' into maintJunio C Hamano2012-09-291-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-mailinfo-mime-attr' into maintJunio C Hamano2012-09-291-3/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-blame-no-such-path' into maintJunio C Hamano2012-09-241-16/+73
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dj/fetch-all-tags' into maintJunio C Hamano2012-09-241-22/+29
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'lt/mailinfo-handle-attachment-more-sanely'Junio C Hamano2012-10-021-11/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | mailinfo: don't require "text" mime type for attachmentsLinus Torvalds2012-09-301-11/+0
* | | | | | | | | | | Merge branch 'tu/gc-auto-quiet'Junio C Hamano2012-10-021-3/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | silence git gc --auto --quiet outputTobias Ulmer2012-09-271-3/+1
* | | | | | | | | | | | Merge branch 'os/commit-submodule-ignore'Junio C Hamano2012-10-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | commit: pay attention to submodule.$name.ignore in .gitmodulesOrgad Shaneh2012-09-241-0/+1
* | | | | | | | | | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher'Junio C Hamano2012-10-011-4/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | receive-pack: drop "n/a" on unpacker errorsJeff King2012-09-211-1/+1
| * | | | | | | | | | | receive-pack: send pack-processing stderr over sidebandJeff King2012-09-211-2/+24
| * | | | | | | | | | | receive-pack: redirect unpack-objects stdout to /dev/nullJeff King2012-09-211-1/+6
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'jc/mailinfo-RE' into maintJunio C Hamano2012-09-201-1/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sn/ls-remote-get-url-doc' into maintJunio C Hamano2012-09-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-remote-remove' into maintJunio C Hamano2012-09-201-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-warn-on-inaccessible-paths' into maintJunio C Hamano2012-09-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/maint-clone-single'Junio C Hamano2012-10-011-14/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | clone --single: limit the fetch refspec to fetched branchRalf Thielow2012-09-201-14/+51
* | | | | | | | | | | | | | | Merge branch 'jc/maint-mailinfo-mime-attr'Junio C Hamano2012-09-251-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | mailinfo: do not concatenate charset= attribute values from mime headersJunio C Hamano2012-09-171-3/+2
* | | | | | | | | | | | | | Merge branch 'jc/maint-log-grep-all-match'Junio C Hamano2012-09-181-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | grep: show --debug output only onceMichael J Gruber2012-09-141-0/+1
| * | | | | | | | | | | | | grep: teach --debug option to dump the parse treeJunio C Hamano2012-09-141-0/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jc/make-static'Junio C Hamano2012-09-181-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | builtin/notes.c: mark file-scope private symbols as staticJunio C Hamano2012-09-151-2/+5
View Lorry Controller Status