summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sync with v1.7.8.1Junio C Hamano2011-12-215-14/+35
|\
| * Git 1.7.8.1v1.7.8.1Junio C Hamano2011-12-211-4/+25
| * Merge branch 'jl/submodule-status-failure-report' into maintJunio C Hamano2011-12-211-2/+2
| |\
| * \ Merge branch 'tr/userdiff-c-returns-pointer' into maintJunio C Hamano2011-12-211-1/+1
| |\ \
| * \ \ Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-213-6/+25
| |\ \ \
| * \ \ \ Merge branch 'cn/maint-lf-to-crlf-filter' into maintJunio C Hamano2011-12-211-14/+40
| |\ \ \ \
| | * | | | lf_to_crlf_filter(): tell the caller we added "\n" when drainingcn/maint-lf-to-crlf-filterJunio C Hamano2011-12-161-5/+7
| * | | | | Merge branch 'jk/maint-upload-archive' into maintJunio C Hamano2011-12-212-4/+22
| |\ \ \ \ \
| * | | | | | clone: the -o option has nothing to do with <branch>Carlos Martín Nieto2011-12-211-2/+2
| * | | | | | builtin/log: remove redundant initializationMichael Schubert2011-12-211-2/+0
| * | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maintJunio C Hamano2011-12-211-1/+1
| |\ \ \ \ \ \
| | * | | | | | builtin/commit: add missing '/' in help messagems/commit-cc-option-helpstringMichael Schubert2011-12-211-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-12-201-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason2011-12-201-1/+1
* | | | | | | | 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