summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-mailinfo-mime-attr' into maintJunio C Hamano2012-09-291-3/+2
|\
| * mailinfo: do not concatenate charset= attribute values from mime headersJunio C Hamano2012-09-171-3/+2
* | Merge branch 'jc/maint-blame-no-such-path' into maintJunio C Hamano2012-09-241-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 'dj/fetch-all-tags' into maintJunio C Hamano2012-09-241-22/+29
|\ \
| * | fetch --all: pass --tags/--no-tags through to each remoteDan Johnson2012-09-071-0/+4
| * | submodule: use argv_array instead of hand-building arraysJens Lehmann2012-09-021-1/+1
| * | fetch: use argv_array instead of hand-building arraysJeff King2012-09-021-22/+25
* | | Merge branch 'jc/mailinfo-RE' into maintJunio C Hamano2012-09-201-1/+3
|\ \ \
| * | | mailinfo: strip "RE: " prefixJunio C Hamano2012-09-091-1/+3
* | | | Merge branch 'sn/ls-remote-get-url-doc' into maintJunio C Hamano2012-09-201-1/+1
|\ \ \ \
| * | | | ls-remote: document the '--get-url' optionStefan Naewe2012-09-071-1/+1
* | | | | Merge branch 'nd/maint-remote-remove' into maintJunio C Hamano2012-09-201-3/+3
|\ \ \ \ \
| * | | | | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-061-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/config-warn-on-inaccessible-paths' into maintJunio C Hamano2012-09-181-2/+2
|\ \ \ \ \
| * | | | | config: warn on inaccessible filesJeff King2012-08-211-2/+2
| |/ / / /
* | | | | 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
|\ \ \ \ \
| * | | | | cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-301-1/+1
| * | | | | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-302-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
| |\ \ \ \ \ \
| | * | | | | | log: fix --quiet synonym for -sJeff King2012-08-281-1/+1
| * | | | | | | Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11Junio C Hamano2012-09-141-1/+16
| |\ \ \ \ \ \ \
| | * | | | | | | split_ident_line(): make best effort when parsing author/committer lineJunio C Hamano2012-08-311-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
| |\ \ \ \ \ \ \
| | * | | | | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-241-25/+43
| * | | | | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-121-2/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-231-2/+14
| * | | | | | | | | Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2012-09-121-1/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | for-each-ref: Fix sort with multiple keysKacper Kornet2012-08-211-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
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | config: "git config baa" should exit with status 1Junio C Hamano2012-07-301-2/+6
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-114-12/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | diff_setup_done(): return voidThomas Rast2012-08-034-12/+6
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-111-1/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | apply: delete unused deflate_origlen from patch structPaul Gortmaker2012-08-051-1/+0
* | | | | | | | | | | Merge branch 'jc/capabilities' into maintJunio C Hamano2012-09-113-5/+36
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch-pack: mention server version with verbose outputJeff King2012-08-131-1/+8
| * | | | | | | | | | | fetch-pack: do not ask for unadvertised capabilitiesJunio C Hamano2012-08-101-0/+6
| * | | | | | | | | | | do not send client agent unless server does firstJeff King2012-08-102-4/+15
| * | | | | | | | | | | send-pack: fix capability-sending logicJeff King2012-08-101-1/+1
| * | | | | | | | | | | include agent identifier in capability stringJeff King2012-08-033-4/+11
* | | | | | | | | | | | Merge branch 'bc/prune-info' into maintJunio C Hamano2012-09-101-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | prune.c: only print informational message in show_only or verbose modeBrandon Casey2012-08-071-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
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status