Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmd_fetch_pack(): return early if finish_connect() fails | Michael Haggerty | 2012-09-12 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter_refs(): simplify logic | Michael Haggerty | 2012-09-12 | 1 | -19/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter_refs(): build refs list as we go | Michael Haggerty | 2012-09-12 | 1 | -27/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter_refs(): delete matched refs from sought list | Michael Haggerty | 2012-09-12 | 1 | -8/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch_pack(): update sought->nr to reflect number of unique entries | Michael Haggerty | 2012-09-12 | 1 | -14/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter_refs(): do not check the same sought_pos twice | Michael Haggerty | 2012-09-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change fetch_pack() and friends to take string_list arguments | Michael Haggerty | 2012-09-12 | 1 | -49/+39 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch_pack(): reindent function decl and defn | Michael Haggerty | 2012-09-12 | 1 | -4/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-blame-no-such-path' | Junio C Hamano | 2012-09-17 | 1 | -16/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: allow "blame file" in the middle of a conflicted merge | Junio C Hamano | 2012-09-11 | 1 | -24/+69 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | blame $path: avoid getting fooled by case insensitive filesystems | Junio C Hamano | 2012-09-10 | 1 | -2/+14 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/mailinfo-RE' | Junio C Hamano | 2012-09-14 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: strip "RE: " prefix | Junio C Hamano | 2012-09-09 | 1 | -1/+3 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-option-parsing-fix' | Junio C Hamano | 2012-09-14 | 1 | -116/+158 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: reorder option handling | Nguyễn Thái Ngọc Duy | 2012-09-11 | 1 | -77/+112 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: move more parameters to struct checkout_opts | Nguyễn Thái Ngọc Duy | 2012-08-29 | 1 | -33/+35 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: pass "struct checkout_opts *" as const pointer | Nguyễn Thái Ngọc Duy | 2012-08-29 | 1 | -16/+21 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dj/fetch-all-tags' | Junio C Hamano | 2012-09-14 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | fetch --all: pass --tags/--no-tags through to each remote | Dan Johnson | 2012-09-07 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sn/ls-remote-get-url-doc' | Junio C Hamano | 2012-09-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | ls-remote: document the '--get-url' option | Stefan Naewe | 2012-09-07 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/path-cleanup' | Junio C Hamano | 2012-09-14 | 4 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Call mkpathdup() rather than xstrdup(mkpath(...)) | Ramsay Jones | 2012-09-04 | 3 | -4/+4 |