summaryrefslogtreecommitdiff
path: root/remote.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/hashmap-cleanup'Junio C Hamano2017-08-111-4/+8
|\
| * remote.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-4/+8
* | Merge branch 'bc/object-id'Junio C Hamano2017-08-111-4/+4
|\ \ | |/ |/|
| * sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-171-1/+1
| * remote: convert struct push_cas to struct object_idbrian m. carlson2017-07-171-3/+3
* | hashmap.h: compare function has access to a data fieldStefan Beller2017-06-301-2/+5
|/
* Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-2/+2
|\ \
| * | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-261-2/+2
| |/
* | Merge branch 'jk/drop-free-refspecs'Junio C Hamano2017-06-051-22/+6
|\ \
| * | remote: drop free_refspecs() functionjk/drop-free-refspecsJeff King2017-06-011-22/+6
| |/
* | Merge branch 'js/bs-is-a-dir-sep-on-windows'Junio C Hamano2017-06-021-1/+6
|\ \
| * | Windows: do not treat a path with backslashes as a remote's nick namejs/bs-is-a-dir-sep-on-windowsJohannes Sixt2017-05-261-1/+6
* | | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-291-2/+3
|\ \ \
| * | | remote: plug memory leak in match_explicit()Johannes Schindelin2017-05-081-2/+3
| | |/ | |/|
* | | object: convert parse_object* to take struct object_idbrian m. carlson2017-05-081-2/+2
* | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-6/+7
|/ /
* | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-04-191-1/+1
|\ \
| * | remote: expose parse_push_refspec functionBrandon Williams2017-04-111-1/+1
* | | Merge branch 'jc/unused-symbols'Junio C Hamano2017-04-161-1/+1
|\ \ \ | |/ / |/| |
| * | remote.[ch]: parse_push_cas_option() can be staticjc/unused-symbolsJunio C Hamano2017-03-311-1/+1
* | | Merge branch 'jn/remote-helpers-with-git-dir'Junio C Hamano2017-02-271-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
|\ \ \ \ \