summaryrefslogtreecommitdiff
path: root/remote.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/remote-helpers-with-git-dir' into maintJunio C Hamano2017-03-241-1/+1
|\
| * remote: avoid reading $GIT_DIR config in non-repoJeff King2017-02-141-1/+1
| * Merge branch 'km/branch-get-push-while-detached' into maintJunio C Hamano2017-01-311-3/+3
| |\
* | \ Merge branch 'js/remote-rename-with-half-configured-remote'Junio C Hamano2017-01-311-2/+10
|\ \ \
| * | | remote rename: more carefully determine whether a remote is configuredjs/remote-rename-with-half-configured-remoteJohannes Schindelin2017-01-191-2/+10
| |/ /
* | | Merge branch 'km/branch-get-push-while-detached'Junio C Hamano2017-01-181-3/+3
|\ \ \ | |/ / |/| / | |/
| * branch_get_push: do not segfault when HEAD is detachedkm/branch-get-push-while-detachedKyle Meyer2017-01-071-3/+3
| * Merge branch 'nd/remote-plural-ours-plus-theirs' into maintJunio C Hamano2016-05-261-1/+1
| |\
| * \ Merge branch 'jk/fix-attribute-macro-in-2.5' into HEADJunio C Hamano2016-05-181-1/+1
| |\ \
* | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-151-4/+4
* | | | Merge branch 'jk/push-force-with-lease-creation' into maintJunio C Hamano2016-09-081-4/+5
|\ \ \ \
| * | | | push: allow pushing new branches with --force-with-leaseJohn Keeping2016-07-261-4/+3
| * | | | push: add shorthand for --force-with-lease branch creationJohn Keeping2016-07-261-0/+2
| * | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-101-8/+5
| |\ \ \ \
* | \ \ \ \ Merge branch 'nd/remote-plural-ours-plus-theirs'Junio C Hamano2016-05-171-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'Junio C Hamano2016-05-031-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
View Lorry Controller Status