summaryrefslogtreecommitdiff
path: root/remote.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/remote-plural-ours-plus-theirs' into maintJunio C Hamano2016-05-261-1/+1
|\
| * remote.c: specify correct plural form in "commit diverge" messagend/remote-plural-ours-plus-theirsNguyễn Thái Ngọc Duy2016-05-061-1/+1
* | Merge branch 'jk/fix-attribute-macro-in-2.5' into HEADJunio C Hamano2016-05-181-1/+1
|\ \
| * | remote.c: spell __attribute__ correctlyjk/fix-attribute-macro-in-2.5Jeff King2016-04-251-1/+1
* | | remote: don't resolve HEAD in non-repositoryJeff King2016-03-061-5/+6
* | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-8/+5
|\ \ \
| * | | use st_add and st_mult for allocation size computationJeff King2016-02-221-4/+4
| * | | convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-221-4/+1
* | | | Merge branch 'tg/git-remote'Junio C Hamano2016-02-261-48/+34
|\ \ \ \
| * | | | remote: simplify remote_is_configured()Thomas Gummerer2016-02-161-11/+2
| * | | | remote: use parse_config_keyThomas Gummerer2016-02-161-37/+32
* | | | | Merge branch 'aw/push-force-with-lease-reporting'Junio C Hamano2016-02-101-7/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | push: fix ref status reporting for --force-with-leaseaw/push-force-with-lease-reportingAndrew Wheeler2016-02-011-7/+8
| |/ / /
* | | | Merge branch 'kf/http-proxy-auth-methods'Junio C Hamano2016-02-031-0/+3
|\ \ \ \
| * | | | http: allow selection of proxy authentication methodKnut Franke2016-01-261-0/+3
| |/ / /
* | | | remote.c: read $GIT_DIR/remotes/* with strbuf_getline()Junio C Hamano2016-01-151-1/+1
* | | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-2/+2
|/ / /
* | | remote: convert functions to struct object_idbrian m. carlson2015-11-201-29/+29
* | | Convert struct object to object_idbrian m. carlson2015-11-201-2/+2
* | | ref_newer: convert to use struct object_idbrian m. carlson2015-11-201-4/+4
* | | Convert struct ref to use object_id.brian m. carlson2015-11-201-29/+29
* | | Merge branch 'rs/pop-commit'Junio C Hamano2015-10-301-4/+2
|\ \ \ | | |/ | |/|
| * | use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commitRené Scharfe2015-10-261-4/+2
* | | read_branches_file: plug a FILE* leakJohannes Sixt2015-10-231-0/+1
* | | stat_tracking_info: convert to argv_arrayJeff King2015-10-051-14/+12
* | | read_remotes_file: simplify string handlingJeff King2015-09-251-37/+18
* | | read_branches_file: simplify string handlingJeff King2015-09-251-34/+20
* | | replace trivial malloc + sprintf / strcpy calls with xstrfmtJeff King2015-09-251-6/+1
|/ /
* | Merge branch 'bc/object-id'Junio C Hamano2015-06-051-5/+8
|\ \ | |/ |/|
| * remote: rewrite functions to take object_id argumentsMichael Haggerty2015-05-251-11/+8
| * each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-251-2/+8
* | remote.c: add branch_get_pushJeff King2015-05-221-0/+85
* | remote.c: return upstream name from stat_tracking_infoJeff King2015-05-221-18/+17
* | remote.c: untangle error logic in branch_get_upstreamJeff King2015-05-221-6/+13
* | remote.c: report specific errors from branch_get_upstreamJeff King2015-05-211-4/+29
* | remote.c: introduce branch_get_upstream helperJeff King2015-05-211-3/+9
* | remote.c: hoist read_config into remote_get_1Jeff King2015-05-211-2/+2
* | remote.c: provide per-branch pushremote nameJeff King2015-05-211-18/+22
* | remote.c: hoist branch.*.remote lookup out of remote_get_1Jeff King2015-05-211-7/+14
* | remote.c: drop "remote" pointer from "struct branch"Jeff King2015-05-211-3/+4
* | remote.c: refactor setup of branch->merge listJeff King2015-05-211-4/+15
* | remote.c: drop default_remote_name variableJeff King2015-05-031-12/+11
|/
* Merge branch 'jc/unused-symbols'Junio C Hamano2015-02-111-1/+1
|\
| * remote.c: make clear_cas_option() staticJunio C Hamano2015-01-151-1/+1
* | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-111-2/+2
|\ \ | |/ |/|
| * use xstrdup_or_null to replace ternary conditionalsJeff King2015-01-131-2/+2
* | Merge branch 'jc/checkout-local-track-report'Junio C Hamano2015-01-071-11/+23
|\ \
| * | checkout: report upstream correctly even with loosely defined branch.*.mergejc/checkout-local-track-reportJunio C Hamano2014-10-141-11/+23
* | | sort_string_list(): rename to string_list_sort()mh/simplify-repack-without-refsMichael Haggerty2014-11-251-3/+3
* | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-4/+7
| |/ |/|
View Lorry Controller Status