Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with v1.7.8.1 | Junio C Hamano | 2011-12-21 | 5 | -14/+35 |
|\ | |||||
| * | Git 1.7.8.1v1.7.8.1 | Junio C Hamano | 2011-12-21 | 1 | -4/+25 |
| * | Merge branch 'jl/submodule-status-failure-report' into maint | Junio C Hamano | 2011-12-21 | 1 | -2/+2 |
| |\ | |||||
| * \ | Merge branch 'tr/userdiff-c-returns-pointer' into maint | Junio C Hamano | 2011-12-21 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 | 3 | -6/+25 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'cn/maint-lf-to-crlf-filter' into maint | Junio C Hamano | 2011-12-21 | 1 | -14/+40 |
| |\ \ \ \ | |||||
| | * | | | | lf_to_crlf_filter(): tell the caller we added "\n" when drainingcn/maint-lf-to-crlf-filter | Junio C Hamano | 2011-12-16 | 1 | -5/+7 |
| * | | | | | Merge branch 'jk/maint-upload-archive' into maint | Junio C Hamano | 2011-12-21 | 2 | -4/+22 |
| |\ \ \ \ \ | |||||
| * | | | | | | clone: the -o option has nothing to do with <branch> | Carlos Martín Nieto | 2011-12-21 | 1 | -2/+2 |
| * | | | | | | builtin/log: remove redundant initialization | Michael Schubert | 2011-12-21 | 1 | -2/+0 |
| * | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maint | Junio C Hamano | 2011-12-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | builtin/commit: add missing '/' in help messagems/commit-cc-option-helpstring | Michael Schubert | 2011-12-21 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-12-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | builtin/init-db.c: eliminate -Wformat warning on Solaris | Ævar Arnfjörð Bjarmason | 2011-12-20 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'mh/ref-api' | Junio C Hamano | 2011-12-20 | 3 | -258/+284 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add_ref(): take a (struct ref_entry *) parametermh/ref-api | Michael Haggerty | 2011-12-12 | 1 | -9/+5 |
| * | | | | | | | | create_ref_entry(): extract function from add_ref() | Michael Haggerty | 2011-12-12 | 1 | -15/+22 |
| * | | | | | | | | repack_without_ref(): remove temporary | Michael Haggerty | 2011-12-12 | 1 | -5/+2 |
| * | | | | | | | | resolve_gitlink_ref_recursive(): change to work with struct ref_cache | Michael Haggerty | 2011-12-12 | 1 | -24/+10 |
| * | | | | | | | | Pass a (ref_cache *) to the resolve_gitlink_*() helper functions | Michael Haggerty | 2011-12-12 | 1 | -20/+20 |
| * | | | | | | | | resolve_gitlink_ref(): improve docstring | Michael Haggerty | 2011-12-12 | 1 | -2/+6 |
| * | | | | | | | | get_ref_dir(): change signature | Michael Haggerty | 2011-12-12 | 1 | -9/+9 |
| * | | | | | | | | refs: change signatures of get_packed_refs() and get_loose_refs() | Michael Haggerty | 2011-12-12 | 1 | -19/+17 |
| * | | | | | | | | is_dup_ref(): extract function from sort_ref_array() | Michael Haggerty | 2011-12-12 | 1 | -12/+25 |
| * | | | | | | | | add_ref(): add docstring | Michael Haggerty | 2011-12-12 | 1 | -0/+1 |
| * | | | | | | | | parse_ref_line(): add docstring | Michael Haggerty | 2011-12-12 | 1 | -0/+5 |
| * | | | | | | | | is_refname_available(): remove the "quiet" argument | Michael Haggerty | 2011-12-12 | 1 | -7/+13 |
| * | | | | | | | | clear_ref_array(): rename from free_ref_array() | Michael Haggerty | 2011-12-12 | 1 | -4/+4 |
| * | | | | | | | | refs: rename parameters result -> sha1 | Michael Haggerty | 2011-12-12 | 2 | -11/+11 |
| * | | | | | | | | refs: rename "refname" variables | Michael Haggerty | 2011-12-12 | 3 | -163/+175 |
| * | | | | | | | | struct ref_entry: document name member | Michael Haggerty | 2011-12-12 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'jc/advice-doc' | Junio C Hamano | 2011-12-20 | 1 | -11/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | advice: Document that they all default to truejc/advice-doc | Junio C Hamano | 2011-12-18 | 1 | -11/+8 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/request-pull-show-head-4' | Junio C Hamano | 2011-12-20 | 2 | -9/+38 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | request-pull: do not emit "tag" before the tagname | Junio C Hamano | 2011-12-19 | 2 | -4/+2 |
| * | | | | | | | | | request-pull: update the "pull" command generation logic | Junio C Hamano | 2011-12-16 | 2 | -9/+40 |
* | | | | | | | | | | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2011-12-20 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | commit: do not lose mergetag header when not amending | Junio C Hamano | 2011-12-20 | 1 | -1/+5 |
* | | | | | | | | | | | Merge branch 'jc/checkout-m-twoway' | Junio C Hamano | 2011-12-20 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t/t2023-checkout-m.sh: fix use of test_must_failjc/checkout-m-twoway | Ævar Arnfjörð Bjarmason | 2011-12-20 | 1 | -1/+3 |
* | | | | | | | | | | | | Merge branch 'tr/cache-tree' | Junio C Hamano | 2011-12-20 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t0090: be prepared that 'wc -l' writes leading blankstr/cache-tree | Johannes Sixt | 2011-12-20 | 1 | -4/+2 |
* | | | | | | | | | | | | | Update draft release notes to 1.7.9 | Junio C Hamano | 2011-12-19 | 1 | -1/+48 |
* | | | | | | | | | | | | | Merge branch 'ab/enable-i18n' | Junio C Hamano | 2011-12-19 | 37 | -39/+1291 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | i18n: add infrastructure for translating Git with gettextab/enable-i18n | Ævar Arnfjörð Bjarmason | 2011-12-05 | 37 | -39/+1291 |
* | | | | | | | | | | | | | | Merge branch 'ew/keepalive' | Junio C Hamano | 2011-12-19 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | enable SO_KEEPALIVE for connected TCP sockets | Eric Wong | 2011-12-05 | 1 | -0/+13 |
* | | | | | | | | | | | | | | | Merge branch 'jc/checkout-m-twoway' | Junio C Hamano | 2011-12-19 | 2 | -24/+83 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | checkout_merged(): squelch false warning from some gcc | Junio C Hamano | 2011-12-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Test 'checkout -m -- path' | Pete Harlan | 2011-12-11 | 1 | -0/+47 |