Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'rs/shortlog-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | shortlog: don't set after_subject to an empty stringrs/shortlog-cleanup | René Scharfe | 2017-03-18 | 1 | -1/+0 | |
* | | | | | | | | | | | | | Merge branch 'rs/path-name-safety-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | revision: remove declaration of path_name()rs/path-name-safety-cleanup | René Scharfe | 2017-03-18 | 1 | -2/+0 | |
* | | | | | | | | | | | | | | Merge branch 'rs/http-push-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -5/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | http-push: don't check return value of lookup_unknown_object()rs/http-push-cleanup | René Scharfe | 2017-03-18 | 1 | -5/+3 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'sb/wt-status-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -15/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | wt-status: simplify by using for_each_string_list_itemsb/wt-status-cleanup | Stefan Beller | 2017-03-17 | 1 | -15/+5 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/pack-name-cleanups' into maint | Junio C Hamano | 2017-03-28 | 6 | -46/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | index-pack: make pointer-alias fallbacks saferjk/pack-name-cleanups | Jeff King | 2017-03-16 | 1 | -8/+12 | |
| * | | | | | | | | | | | | | | replace snprintf with odb_pack_name() | Jeff King | 2017-03-16 | 2 | -31/+24 | |
| * | | | | | | | | | | | | | | odb_pack_keep(): stop generating keepfile name | Jeff King | 2017-03-16 | 4 | -12/+12 | |
| * | | | | | | | | | | | | | | sha1_file.c: make pack-name helper globally accessible | Jeff King | 2017-03-16 | 2 | -11/+15 | |
| * | | | | | | | | | | | | | | move odb_* declarations out of git-compat-util.h | Jeff King | 2017-03-16 | 2 | -2/+12 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -52/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | rev-parse: simplify parsing of ref optionsjk/rev-parse-cleanup | Jeff King | 2017-03-15 | 1 | -29/+16 | |
| * | | | | | | | | | | | | | | | rev-parse: add helper for parsing "--foo/--foo=" | Jeff King | 2017-03-15 | 1 | -10/+28 | |
| * | | | | | | | | | | | | | | | rev-parse: use skip_prefix when parsing options | Jeff King | 2017-03-15 | 1 | -20/+20 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'rs/blame-code-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -17/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | blame: move blame_entry duplication to add_blame_entry()rs/blame-code-cleanup | René Scharfe | 2017-03-11 | 1 | -17/+8 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'st/verify-tag' into maint | Junio C Hamano | 2017-03-28 | 2 | -14/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | t7004, t7030: fix here-doc syntax errorsst/verify-tag | Santiago Torres | 2017-03-24 | 2 | -14/+10 | |
* | | | | | | | | | | | | | | | | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2017-03-28 | 2 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | pickaxe: fix segfault with '-S<...> --pickaxe-regex'js/regexec-buf | SZEDER Gábor | 2017-03-18 | 2 | -2/+10 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/execv-dashed-external' into maint | Junio C Hamano | 2017-03-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | run-command: fix segfault when cleaning forked async processjk/execv-dashed-external | Jeff King | 2017-03-18 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'ew/http-alternates-as-redirects-warning' into maint | Junio C Hamano | 2017-03-28 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | http: release strbuf on disabled alternatesew/http-alternates-as-redirects-warning | Eric Wong | 2017-03-06 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | http: inform about alternates-as-redirects behavior | Eric Wong | 2017-03-06 | 1 | -3/+5 | |
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'dp/filter-branch-prune-empty' into maint | Junio C Hamano | 2017-03-28 | 4 | -8/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | p7000: add test for filter-branch with --prune-emptydp/filter-branch-prune-empty | Devin J. Pohly | 2017-03-03 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | filter-branch: fix --prune-empty on parentless commits | Devin J. Pohly | 2017-03-03 | 3 | -10/+10 | |
| * | | | | | | | | | | | | | | | | | | t7003: ensure --prune-empty removes entire branch when applicable | Devin J. Pohly | 2017-03-03 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | t7003: ensure --prune-empty can prune root commit | Devin J. Pohly | 2017-03-03 | 1 | -0/+30 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maint | Junio C Hamano | 2017-03-28 | 7 | -30/+66 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | fetch-pack: add specific error for fetching an unadvertised objectmm/fetch-show-error-message-on-unadvertised-object | Matt McCutchen | 2017-03-02 | 3 | -18/+35 | |
| * | | | | | | | | | | | | | | | | | | fetch_refs_via_pack: call report_unmatched_refs | Matt McCutchen | 2017-03-02 | 2 | -6/+11 | |
| * | | | | | | | | | | | | | | | | | | fetch-pack: move code to report unmatched refs to a function | Matt McCutchen | 2017-03-02 | 4 | -9/+23 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/interpret-branch-name' into maint | Junio C Hamano | 2017-03-28 | 10 | -51/+249 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | checkout: restrict @-expansions when finding branchjk/interpret-branch-name | Jeff King | 2017-03-02 | 2 | -1/+11 | |
| * | | | | | | | | | | | | | | | | | | strbuf_check_ref_format(): expand only local branches | Jeff King | 2017-03-02 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | branch: restrict @-expansions when deleting | Jeff King | 2017-03-02 | 2 | -4/+7 | |
| * | | | | | | | | | | | | | | | | | | t3204: test git-branch @-expansion corner cases | Jeff King | 2017-03-02 | 1 | -0/+123 | |
| * | | | | | | | | | | | | | | | | | | interpret_branch_name: allow callers to restrict expansions | Jeff King | 2017-03-02 | 8 | -28/+69 | |
| * | | | | | | | | | | | | | | | | | | strbuf_branchname: add docstring | Jeff King | 2017-03-02 | 1 | -0/+15 | |
| * | | | | | | | | | | | | | | | | | | strbuf_branchname: drop return value | Jeff King | 2017-03-02 | 2 | -5/+2 | |
| * | | | | | | | | | | | | | | | | | | interpret_branch_name: move docstring to header file | Jeff King | 2017-03-02 | 2 | -21/+21 | |
| * | | | | | | | | | | | | | | | | | | interpret_branch_name(): handle auto-namelen for @{-1} | Jeff King | 2017-03-02 | 2 | -1/+10 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'ab/cond-skip-tests' into maint | Junio C Hamano | 2017-03-28 | 3 | -1/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | gitweb tests: skip tests when we don't have Time::HiResab/cond-skip-tests | Ævar Arnfjörð Bjarmason | 2017-03-01 | 1 | -0/+5 |