summaryrefslogtreecommitdiff
path: root/remote.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | push: require force for annotated tagsChris Rorvick2012-12-021-2/+9
| * | push: require force for refs under refs/tags/Chris Rorvick2012-12-021-4/+14
| * | push: flag updates that require forceChris Rorvick2012-12-021-3/+8
| * | push: keep track of "update" state separatelyChris Rorvick2012-12-021-7/+11
| * | push: add advice for rejected tag referenceChris Rorvick2012-12-021-0/+10
| |/
* | Merge branch 'mm/status-push-pull-advise'Junio C Hamano2012-12-031-6/+9
|\ \
| * | status: respect advice.statusHints for ahead/behind adviceJeff King2012-12-031-6/+9
* | | Merge branch 'mm/status-push-pull-advise'Junio C Hamano2012-11-281-3/+10
|\ \ \ | |/ /
| * | status: add advice on how to push/pull to tracking branchMatthieu Moy2012-11-161-3/+10
| |/
* | Merge branch 'jc/maint-fetch-tighten-refname-check'Junio C Hamano2012-11-151-2/+2
|\ \ | |/ |/|
| * get_fetch_map(): tighten checks on dest refsJunio C Hamano2012-10-191-2/+2
* | Merge branch 'jk/push-delete-ref-error-message'Junio C Hamano2012-07-131-0/+3
|\ \
| * | push: don't guess at qualifying remote refs on deletionJeff King2012-07-031-0/+3
* | | add sorting infrastructure for list refsJeff King2012-05-221-0/+22
|/ /
* | push: add '--prune' optionfc/push-pruneFelipe Contreras2012-02-221-3/+28
* | remote: refactor code into alloc_delete_ref()Felipe Contreras2012-02-221-5/+9
* | remote: reorganize check_pattern_match()Felipe Contreras2012-02-221-29/+30
* | remote: use a local variable in match_push_refs()Felipe Contreras2012-02-221-9/+10
* | i18n: format_tracking_info "Your branch is behind" messagejx/i18n-more-markingJiang Xin2012-02-011-11/+21
* | Rename resolve_ref() to resolve_ref_unsafe()nd/resolve-refNguyễn Thái Ngọc Duy2011-12-131-3/+3
* | Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-131-2/+2
|/
* Merge branch 'cn/fetch-prune'Junio C Hamano2011-10-261-48/+56
|\
| * fetch: honor the user-provided refspecs when pruning refsCarlos Martín Nieto2011-10-151-12/+23
| * remote: separate out the remote_find_tracking logic into query_refspecsCarlos Martín Nieto2011-10-151-36/+33
* | Merge branch 'jc/match-refs-clarify'Junio C Hamano2011-10-211-5/+8
|\ \
| * | rename "match_refs()" to "match_push_refs()"jc/match-refs-clarifyJunio C Hamano2011-09-121-5/+8
| |/
* | remote: use xstrdup() instead of strdup()Michael Haggerty2011-10-051-1/+1
* | Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-051-39/+14
|/
* make copy_ref globally availableJeff King2011-06-071-1/+1
* consider only branches in guess_remote_headJeff King2011-06-051-1/+3
* Change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-031-1/+1
* string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-051-2/+2
* Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-301-3/+3
|\
| * string_list: Fix argument order for string_list_appendJulian Phillips2010-06-271-1/+1
| * string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-271-1/+1
| * string_list: Fix argument order for string_list_insertJulian Phillips2010-06-271-1/+1
* | Merge branch 'gv/portable'Junio C Hamano2010-06-211-2/+1
|\ \
| * | Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-311-2/+1
* | | Merge branch 'maint'Junio C Hamano2010-06-071-1/+1
|\ \ \ | |_|/ |/| |