summaryrefslogtreecommitdiff
path: root/remote.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-171-23/+23
|\
| * replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-23/+23
* | Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'Junio C Hamano2013-12-121-28/+66
|\ \ | |/ |/|
| * fetch: improve the error messages emitted for conflicting refspecsmh/fetch-tags-in-addition-to-normal-refsMichael Haggerty2013-10-301-3/+22
| * handle_duplicate(): mark error message for translationMichael Haggerty2013-10-301-1/+1
| * ref_remote_duplicates(): extract a function handle_duplicate()Michael Haggerty2013-10-301-8/+10
| * ref_remove_duplicates(): simplify loop logicMichael Haggerty2013-10-301-21/+31
| * ref_remove_duplicates(): avoid redundant bisectionMichael Haggerty2013-10-301-6/+6
| * query_refspecs(): move some constants out of the loopMichael Haggerty2013-10-301-2/+2
| * get_expanded_map(): avoid memory leakMichael Haggerty2013-10-301-3/+3
| * get_expanded_map(): add docstringMichael Haggerty2013-10-301-0/+7
* | Merge branch 'jk/remote-literal-string-leakfix'Junio C Hamano2013-10-281-1/+1
|\ \ | |/ |/|
| * remote: do not copy "origin" string literaljk/remote-literal-string-leakfixJeff King2013-10-151-1/+1
* | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-09-201-25/+47
|\ \
| * | status: always show tracking branch even no changeJiang Xin2013-08-261-3/+4
| * | branch: report invalid tracking branch as goneJiang Xin2013-08-261-25/+46
| |/
* | Merge branch 'jc/push-cas'Junio C Hamano2013-09-091-13/+162
|\ \
| * | push --force-with-lease: tie it all togetherJunio C Hamano2013-07-221-13/+36
| * | push --force-with-lease: implement logic to populate old_sha1_expect[]Junio C Hamano2013-07-221-0/+61
| * | remote.c: add command line option parser for "--force-with-lease"Junio C Hamano2013-07-221-0/+57
| * | cache.h: move remote/connect API out of itJunio C Hamano2013-07-081-0/+8
* | | Merge branch 'ms/fetch-prune-configuration'Junio C Hamano2013-09-091-0/+3
|\ \ \ | |_|/ |/| |
| * | fetch: make --prune configurablems/fetch-prune-configurationMichael Schubert2013-07-181-0/+3
* | | Merge branch 'bc/push-match-many-refs'Junio C Hamano2013-07-181-2/+25
|\ \ \ | |_|/ |/| |
| * | remote.c: avoid O(m*n) behavior in match_push_refsbc/push-match-many-refsBrandon Casey2013-07-081-2/+25
| |/
* | remote: remove dead code in read_branches_file()Ramkumar Ramachandra2013-06-231-19/+4
* | remote: trivial style cleanupFelipe Contreras2013-05-281-2/+1
|/
* remote.c: introduce branch.<name>.pushremoteRamkumar Ramachandra2013-04-021-0/+4
* remote.c: introduce remote.pushdefaultRamkumar Ramachandra2013-04-021-0/+7
* remote.c: introduce a way to have different remotes for fetch/pushRamkumar Ramachandra2013-04-021-4/+21
* remote.c: simplify a bit of code using git_config_string()Ramkumar Ramachandra2013-04-021-3/+2
* Merge branch 'jc/nobody-sets-src-peer-ref'Junio C Hamano2013-04-011-3/+0
|\
| * match_push_refs(): nobody sets src->peer_ref anymoreJunio C Hamano2013-03-041-3/+0
* | Merge branch 'jc/push-follow-tag'Junio C Hamano2013-03-251-0/+99
|\ \
| * | push: --follow-tagsJunio C Hamano2013-03-051-0/+99
| |/
| * Merge branch 'jc/fetch-ignore-symref' into maintJunio C Hamano2013-01-111-1/+12
| |\
* | \ Merge branch 'jc/fetch-raw-sha1'Junio C Hamano2013-03-211-18/+23
|\ \ \
| * | | fetch: fetch objects by their exact SHA-1 object namesJunio C Hamano2013-02-071-1/+11
| * | | parse_fetch_refspec(): clarify the codeflow a bitJunio C Hamano2013-02-071-17/+12
* | | | Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-041-23/+19
|\ \ \ \
| * | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-241-3/+8
| * | | | push: further simplify the logic to assign rejection reasonJunio C Hamano2013-01-241-16/+11
| * | | | push: further clean up fields of "struct ref"Junio C Hamano2013-01-241-10/+6
* | | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-231-36/+7
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | push: fix "refs/tags/ hierarchy cannot be updated without --force"Junio C Hamano2013-01-161-36/+7
* | | | Merge branch 'jc/fetch-ignore-symref'Junio C Hamano2013-01-051-1/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | fetch: ignore wildcarded refspecs that update local symbolic refsJunio C Hamano2012-12-111-1/+12
* | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-051-20/+63
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | push: cleanup push rules commentChris Rorvick2012-12-031-15/+17
| * | push: clarify rejection of update to non-commit-ishChris Rorvick2012-12-021-0/+5
View Lorry Controller Status