Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'lt/mailinfo-handle-attachment-more-sanely' | Junio C Hamano | 2012-10-02 | 1 | -11/+0 |
|\ | |||||
| * | mailinfo: don't require "text" mime type for attachments | Linus Torvalds | 2012-09-30 | 1 | -11/+0 |
* | | Merge branch 'tu/gc-auto-quiet' | Junio C Hamano | 2012-10-02 | 1 | -3/+1 |
|\ \ | |||||
| * | | silence git gc --auto --quiet output | Tobias Ulmer | 2012-09-27 | 1 | -3/+1 |
* | | | Merge branch 'os/commit-submodule-ignore' | Junio C Hamano | 2012-10-01 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | commit: pay attention to submodule.$name.ignore in .gitmodules | Orgad Shaneh | 2012-09-24 | 1 | -0/+1 |
* | | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher' | Junio C Hamano | 2012-10-01 | 1 | -4/+31 |
|\ \ \ \ | |||||
| * | | | | receive-pack: drop "n/a" on unpacker errors | Jeff King | 2012-09-21 | 1 | -1/+1 |
| * | | | | receive-pack: send pack-processing stderr over sideband | Jeff King | 2012-09-21 | 1 | -2/+24 |
| * | | | | receive-pack: redirect unpack-objects stdout to /dev/null | Jeff King | 2012-09-21 | 1 | -1/+6 |
| * | | | | Merge branch 'jc/mailinfo-RE' into maint | Junio C Hamano | 2012-09-20 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'sn/ls-remote-get-url-doc' into maint | Junio C Hamano | 2012-09-20 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'nd/maint-remote-remove' into maint | Junio C Hamano | 2012-09-20 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/config-warn-on-inaccessible-paths' into maint | Junio C Hamano | 2012-09-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'rt/maint-clone-single' | Junio C Hamano | 2012-10-01 | 1 | -14/+51 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clone --single: limit the fetch refspec to fetched branch | Ralf Thielow | 2012-09-20 | 1 | -14/+51 |
* | | | | | | | | | | Merge branch 'jc/maint-mailinfo-mime-attr' | Junio C Hamano | 2012-09-25 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | mailinfo: do not concatenate charset= attribute values from mime headers | Junio C Hamano | 2012-09-17 | 1 | -3/+2 |
* | | | | | | | | | | Merge branch 'jc/maint-log-grep-all-match' | Junio C Hamano | 2012-09-18 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | grep: show --debug output only once | Michael J Gruber | 2012-09-14 | 1 | -0/+1 |
| * | | | | | | | | | | grep: teach --debug option to dump the parse tree | Junio C Hamano | 2012-09-14 | 1 | -0/+3 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jc/make-static' | Junio C Hamano | 2012-09-18 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin/notes.c: mark file-scope private symbols as static | Junio C Hamano | 2012-09-15 | 1 | -2/+5 |
* | | | | | | | | | | | Merge branch 'mv/cherry-pick-s' | Junio C Hamano | 2012-09-18 | 1 | -57/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | cherry-pick: don't forget -s on failure | Miklos Vajna | 2012-09-14 | 1 | -57/+24 |
* | | | | | | | | | | | | Merge branch 'nd/fetch-status-alignment' | Junio C Hamano | 2012-09-18 | 1 | -8/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fetch: align per-ref summary report in UTF-8 locales | Nguyễn Thái Ngọc Duy | 2012-09-14 | 1 | -8/+7 |
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-09-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add missing -z to git check-attr usage text for consistency with man page | Adam Spiers | 2012-09-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | Merge branch 'mz/cherry-pick-cmdline-order' into maint | Junio C Hamano | 2012-09-14 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Sync with 1.7.11.7 | Junio C Hamano | 2012-09-14 | 2 | -2/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11 | Junio C Hamano | 2012-09-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11 | Junio C Hamano | 2012-09-14 | 1 | -1/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-12 | 3 | -28/+60 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -25/+43 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -2/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Sync with 1.7.11.6 | Junio C Hamano | 2012-09-11 | 6 | -15/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -2/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 4 | -12/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/capabilities' into maint | Junio C Hamano | 2012-09-11 | 3 | -5/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/prune-info' into maint | Junio C Hamano | 2012-09-10 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-10 | 4 | -8/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 3 | -7/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/fetch-filter-refs' | Junio C Hamano | 2012-09-17 | 1 | -105/+64 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: eliminate spurious error messages | Michael Haggerty | 2012-09-12 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | cmd_fetch_pack(): simplify computation of return value | Michael Haggerty | 2012-09-12 | 1 | -11/+10 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: report missing refs even if no existing refs were received | Michael Haggerty | 2012-09-12 | 1 | -1/+1 |