summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'mv/cherry-pick-s'Junio C Hamano2012-09-181-57/+24
|\ \ \
| * | | cherry-pick: don't forget -s on failureMiklos Vajna2012-09-141-57/+24
* | | | Merge branch 'nd/fetch-status-alignment'Junio C Hamano2012-09-181-8/+7
|\ \ \ \
| * | | | fetch: align per-ref summary report in UTF-8 localesNguyễn Thái Ngọc Duy2012-09-141-8/+7
* | | | | Merge branch 'maint'Junio C Hamano2012-09-171-1/+1
|\ \ \ \ \
| * | | | | Add missing -z to git check-attr usage text for consistency with man pageAdam Spiers2012-09-171-1/+1
| * | | | | Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-142-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Sync with 1.7.11.7Junio C Hamano2012-09-142-2/+17
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11Junio C Hamano2012-09-141-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11Junio C Hamano2012-09-141-1/+16
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-123-28/+60
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-121-25/+43
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-121-2/+14
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2012-09-121-1/+3
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Sync with 1.7.11.6Junio C Hamano2012-09-116-15/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano2012-09-111-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-114-12/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-111-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/capabilities' into maintJunio C Hamano2012-09-113-5/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/prune-info' into maintJunio C Hamano2012-09-101-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-104-8/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2012-09-101-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-103-7/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/fetch-filter-refs'Junio C Hamano2012-09-171-105/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | fetch-pack: eliminate spurious error messagesMichael Haggerty2012-09-121-5/+5
| * | | | | | | | | | | | | | | | | | | cmd_fetch_pack(): simplify computation of return valueMichael Haggerty2012-09-121-11/+10
| * | | | | | | | | | | | | | | | | | | fetch-pack: report missing refs even if no existing refs were receivedMichael Haggerty2012-09-121-1/+1
| * | | | | | | | | | | | | | | | | | | cmd_fetch_pack(): return early if finish_connect() failsMichael Haggerty2012-09-121-3/+3
| * | | | | | | | | | | | | | | | | | | filter_refs(): simplify logicMichael Haggerty2012-09-121-19/+18
| * | | | | | | | | | | | | | | | | | | filter_refs(): build refs list as we goMichael Haggerty2012-09-121-27/+4
| * | | | | | | | | | | | | | | | | | | filter_refs(): delete matched refs from sought listMichael Haggerty2012-09-121-8/+15
| * | | | | | | | | | | | | | | | | | | fetch_pack(): update sought->nr to reflect number of unique entriesMichael Haggerty2012-09-121-14/+1
| * | | | | | | | | | | | | | | | | | | filter_refs(): do not check the same sought_pos twiceMichael Haggerty2012-09-121-1/+1
| * | | | | | | | | | | | | | | | | | | Change fetch_pack() and friends to take string_list argumentsMichael Haggerty2012-09-121-49/+39
| * | | | | | | | | | | | | | | | | | | fetch_pack(): reindent function decl and defnMichael Haggerty2012-09-121-4/+4
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-blame-no-such-path'Junio C Hamano2012-09-171-16/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | blame: allow "blame file" in the middle of a conflicted mergeJunio C Hamano2012-09-111-24/+69
| * | | | | | | | | | | | | | | | | | | blame $path: avoid getting fooled by case insensitive filesystemsJunio C Hamano2012-09-101-2/+14
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/mailinfo-RE'Junio C Hamano2012-09-141-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | mailinfo: strip "RE: " prefixJunio C Hamano2012-09-091-1/+3
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-option-parsing-fix'Junio C Hamano2012-09-141-116/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | checkout: reorder option handlingNguyễn Thái Ngọc Duy2012-09-111-77/+112
| * | | | | | | | | | | | | | | | | | | checkout: move more parameters to struct checkout_optsNguyễn Thái Ngọc Duy2012-08-291-33/+35
View Lorry Controller Status