summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \
| * | | | | | revert: stop creating and removing sequencer-old directoryjn/maint-sequencer-fixesJonathan Nieder2011-12-123-21/+7
| * | | | | | Revert "reset: Make reset remove the sequencer state"Jonathan Nieder2011-12-123-55/+1
| * | | | | | revert: do not remove state until sequence is finishedJonathan Nieder2011-12-122-14/+4
| * | | | | | revert: allow single-pick in the middle of cherry-pick sequenceJonathan Nieder2011-12-122-0/+38
| * | | | | | revert: pass around rev-list args in already-parsed formJonathan Nieder2011-12-122-24/+34
| * | | | | | revert: allow cherry-pick --continue to commit before resumingJonathan Nieder2011-12-122-6/+156
| * | | | | | revert: give --continue handling its own functionJonathan Nieder2011-12-121-11/+17
* | | | | | | Merge branch 'jk/maint-snprintf-va-copy'Junio C Hamano2011-12-191-2/+7
|\ \ \ \ \ \ \
| * | | | | | | compat/snprintf: don't look at va_list twicejk/maint-snprintf-va-copyJeff King2011-12-121-2/+7
* | | | | | | | Merge branch 'jk/maint-mv'Junio C Hamano2011-12-192-4/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | mv: be quiet about overwritingjk/maint-mvJeff King2011-12-121-1/+2
| * | | | | | | | mv: improve overwrite warningJeff King2011-12-121-1/+1
| * | | | | | | | mv: make non-directory destination error more clearJeff King2011-12-121-1/+1
| * | | | | | | | mv: honor --verbose flagJeff King2011-12-122-2/+7
| * | | | | | | | docs: mention "-k" for both forms of "git mv"Jeff King2011-12-121-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ci/stripspace-docs'Junio C Hamano2011-12-192-7/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | Update documentation for stripspaceci/stripspace-docsConrad Irwin2011-12-122-7/+64
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'rr/test-chaining'Junio C Hamano2011-12-1915-199/+123
|\ \ \ \ \ \ \ \
| * | | | | | | | t3401: use test_commit in setuprr/test-chainingMartin von Zweigbergk2011-12-111-25/+10
| * | | | | | | | t3401: modernize styleMartin von Zweigbergk2011-12-111-34/+33
| * | | | | | | | t3040 (subprojects-basic): fix '&&' chaining, modernize styleRamkumar Ramachandra2011-12-091-72/+72
| * | | | | | | | t1510 (worktree): fix '&&' chainingRamkumar Ramachandra2011-12-091-3/+3
| * | | | | | | | t3030 (merge-recursive): use test_expect_codeRamkumar Ramachandra2011-12-091-66/+6
| * | | | | | | | test: fix '&&' chainingRamkumar Ramachandra2011-12-0810-17/+17
| * | | | | | | | t3200 (branch): fix '&&' chainingRamkumar Ramachandra2011-12-081-2/+2
* | | | | | | | | Merge branch 'tr/cache-tree'Junio C Hamano2011-12-1910-11/+144
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reset: update cache-tree data when appropriateThomas Rast2011-12-062-2/+9
| * | | | | | | | | commit: write cache-tree data when writing index anywayThomas Rast2011-12-062-1/+3
| * | | | | | | | | Refactor cache_tree_update idiom from commitThomas Rast2011-12-065-11/+21