summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch 'mh/ref-api'Junio C Hamano2011-12-203-258/+284
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add_ref(): take a (struct ref_entry *) parametermh/ref-apiMichael Haggerty2011-12-121-9/+5
| * | | | | | | | | | | | | | create_ref_entry(): extract function from add_ref()Michael Haggerty2011-12-121-15/+22
| * | | | | | | | | | | | | | repack_without_ref(): remove temporaryMichael Haggerty2011-12-121-5/+2
| * | | | | | | | | | | | | | resolve_gitlink_ref_recursive(): change to work with struct ref_cacheMichael Haggerty2011-12-121-24/+10
| * | | | | | | | | | | | | | Pass a (ref_cache *) to the resolve_gitlink_*() helper functionsMichael Haggerty2011-12-121-20/+20
| * | | | | | | | | | | | | | resolve_gitlink_ref(): improve docstringMichael Haggerty2011-12-121-2/+6
| * | | | | | | | | | | | | | get_ref_dir(): change signatureMichael Haggerty2011-12-121-9/+9
| * | | | | | | | | | | | | | refs: change signatures of get_packed_refs() and get_loose_refs()Michael Haggerty2011-12-121-19/+17
| * | | | | | | | | | | | | | is_dup_ref(): extract function from sort_ref_array()Michael Haggerty2011-12-121-12/+25
| * | | | | | | | | | | | | | add_ref(): add docstringMichael Haggerty2011-12-121-0/+1
| * | | | | | | | | | | | | | parse_ref_line(): add docstringMichael Haggerty2011-12-121-0/+5
| * | | | | | | | | | | | | | is_refname_available(): remove the "quiet" argumentMichael Haggerty2011-12-121-7/+13
| * | | | | | | | | | | | | | clear_ref_array(): rename from free_ref_array()Michael Haggerty2011-12-121-4/+4
| * | | | | | | | | | | | | | refs: rename parameters result -> sha1Michael Haggerty2011-12-122-11/+11
| * | | | | | | | | | | | | | refs: rename "refname" variablesMichael Haggerty2011-12-123-163/+175
| * | | | | | | | | | | | | | struct ref_entry: document name memberMichael Haggerty2011-12-121-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/advice-doc'Junio C Hamano2011-12-201-11/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | advice: Document that they all default to truejc/advice-docJunio C Hamano2011-12-181-11/+8
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-202-9/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | request-pull: do not emit "tag" before the tagnameJunio C Hamano2011-12-192-4/+2
| * | | | | | | | | | | | | | request-pull: update the "pull" command generation logicJunio C Hamano2011-12-162-9/+40
* | | | | | | | | | | | | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2011-12-201-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | commit: do not lose mergetag header when not amendingJunio C Hamano2011-12-201-1/+5
* | | | | | | | | | | | | | | | Merge branch 'jc/checkout-m-twoway'Junio C Hamano2011-12-201-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t/t2023-checkout-m.sh: fix use of test_must_failjc/checkout-m-twowayÆvar Arnfjörð Bjarmason2011-12-201-1/+3
* | | | | | | | | | | | | | | | | Merge branch 'tr/cache-tree'Junio C Hamano2011-12-201-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t0090: be prepared that 'wc -l' writes leading blankstr/cache-treeJohannes Sixt2011-12-201-4/+2
* | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.9Junio C Hamano2011-12-191-1/+48
* | | | | | | | | | | | | | | | | | Merge branch 'ab/enable-i18n'Junio C Hamano2011-12-1937-39/+1291
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | i18n: add infrastructure for translating Git with gettextab/enable-i18nÆvar Arnfjörð Bjarmason2011-12-0537-39/+1291
* | | | | | | | | | | | | | | | | | | Merge branch 'ew/keepalive'Junio C Hamano2011-12-191-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | enable SO_KEEPALIVE for connected TCP socketsEric Wong2011-12-051-0/+13
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/checkout-m-twoway'Junio C Hamano2011-12-192-24/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | checkout_merged(): squelch false warning from some gccJunio C Hamano2011-12-151-1/+1
| * | | | | | | | | | | | | | | | | | | Test 'checkout -m -- path'Pete Harlan2011-12-111-0/+47
| * | | | | | | | | | | | | | | | | | | checkout -m: no need to insist on having all 3 stagesJunio C Hamano2011-12-061-24/+36
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-push-over-dav'Junio C Hamano2011-12-197-5/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | http-push: enable "proactive auth"jk/maint-push-over-davJeff King2011-12-136-6/+13
| * | | | | | | | | | | | | | | | | | | | t5540: test DAV push with authenticationJeff King2011-12-132-0/+37
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fetch-no-tail-match-refs'Junio C Hamano2011-12-198-41/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | connect.c: drop path_match functionjk/fetch-no-tail-match-refsJeff King2011-12-132-22/+0
| * | | | | | | | | | | | | | | | | | | | fetch-pack: match refs exactlyJeff King2011-12-132-4/+38
| * | | | | | | | | | | | | | | | | | | | t5500: give fully-qualified refs to fetch-packJeff King2011-12-131-3/+3
| * | | | | | | | | | | | | | | | | | | | drop "match" parameter from get_remote_headsJeff King2011-12-136-12/+7
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-1921-76/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Rename resolve_ref() to resolve_ref_unsafe()nd/resolve-refNguyễn Thái Ngọc Duy2011-12-1313-26/+26
| * | | | | | | | | | | | | | | | | | | | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-1312-50/+47
| * | | | | | | | | | | | | | | | | | | | revert: convert resolve_ref() to read_ref_full()Nguyễn Thái Ngọc Duy2011-12-121-1/+1
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-sequencer-fixes'Junio C Hamano2011-12-196-126/+252
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \