Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | checkout -m: no need to insist on having all 3 stages | Junio C Hamano | 2011-12-06 | 1 | -24/+36 |
* | | | | Merge branch 'jk/maint-push-over-dav' | Junio C Hamano | 2011-12-19 | 7 | -5/+49 |
|\ \ \ \ | |||||
| * | | | | http-push: enable "proactive auth"jk/maint-push-over-dav | Jeff King | 2011-12-13 | 6 | -6/+13 |
| * | | | | t5540: test DAV push with authentication | Jeff King | 2011-12-13 | 2 | -0/+37 |
* | | | | | Merge branch 'jk/fetch-no-tail-match-refs' | Junio C Hamano | 2011-12-19 | 8 | -41/+48 |
|\ \ \ \ \ | |||||
| * | | | | | connect.c: drop path_match functionjk/fetch-no-tail-match-refs | Jeff King | 2011-12-13 | 2 | -22/+0 |
| * | | | | | fetch-pack: match refs exactly | Jeff King | 2011-12-13 | 2 | -4/+38 |
| * | | | | | t5500: give fully-qualified refs to fetch-pack | Jeff King | 2011-12-13 | 1 | -3/+3 |
| * | | | | | drop "match" parameter from get_remote_heads | Jeff King | 2011-12-13 | 6 | -12/+7 |
| |/ / / / | |||||
* | | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-19 | 21 | -76/+73 |
|\ \ \ \ \ | |||||
| * | | | | | Rename resolve_ref() to resolve_ref_unsafe()nd/resolve-ref | Nguyễn Thái Ngọc Duy | 2011-12-13 | 13 | -26/+26 |
| * | | | | | Convert resolve_ref+xstrdup to new resolve_refdup function | Nguyễn Thái Ngọc Duy | 2011-12-13 | 12 | -50/+47 |
| * | | | | | revert: convert resolve_ref() to read_ref_full() | Nguyễn Thái Ngọc Duy | 2011-12-12 | 1 | -1/+1 |
* | | | | | | Merge branch 'jn/maint-sequencer-fixes' | Junio C Hamano | 2011-12-19 | 6 | -126/+252 |
|\ \ \ \ \ \ | |||||
| * | | | | | | revert: stop creating and removing sequencer-old directoryjn/maint-sequencer-fixes | Jonathan Nieder | 2011-12-12 | 3 | -21/+7 |
| * | | | | | | Revert "reset: Make reset remove the sequencer state" | Jonathan Nieder | 2011-12-12 | 3 | -55/+1 |
| * | | | | | | revert: do not remove state until sequence is finished | Jonathan Nieder | 2011-12-12 | 2 | -14/+4 |
| * | | | | | | revert: allow single-pick in the middle of cherry-pick sequence | Jonathan Nieder | 2011-12-12 | 2 | -0/+38 |
| * | | | | | | revert: pass around rev-list args in already-parsed form | Jonathan Nieder | 2011-12-12 | 2 | -24/+34 |
| * | | | | | | revert: allow cherry-pick --continue to commit before resuming | Jonathan Nieder | 2011-12-12 | 2 | -6/+156 |
| * | | | | | | revert: give --continue handling its own function | Jonathan Nieder | 2011-12-12 | 1 | -11/+17 |
* | | | | | | | Merge branch 'jk/maint-snprintf-va-copy' | Junio C Hamano | 2011-12-19 | 1 | -2/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | compat/snprintf: don't look at va_list twicejk/maint-snprintf-va-copy | Jeff King | 2011-12-12 | 1 | -2/+7 |
* | | | | | | | | Merge branch 'jk/maint-mv' | Junio C Hamano | 2011-12-19 | 2 | -4/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mv: be quiet about overwritingjk/maint-mv | Jeff King | 2011-12-12 | 1 | -1/+2 |
| * | | | | | | | | mv: improve overwrite warning | Jeff King | 2011-12-12 | 1 | -1/+1 |
| * | | | | | | | | mv: make non-directory destination error more clear | Jeff King | 2011-12-12 | 1 | -1/+1 |
| * | | | | | | | | mv: honor --verbose flag | Jeff King | 2011-12-12 | 2 | -2/+7 |
| * | | | | | | | | docs: mention "-k" for both forms of "git mv" | Jeff King | 2011-12-12 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ci/stripspace-docs' | Junio C Hamano | 2011-12-19 | 2 | -7/+64 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update documentation for stripspaceci/stripspace-docs | Conrad Irwin | 2011-12-12 | 2 | -7/+64 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rr/test-chaining' | Junio C Hamano | 2011-12-19 | 15 | -199/+123 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3401: use test_commit in setuprr/test-chaining | Martin von Zweigbergk | 2011-12-11 | 1 | -25/+10 |
| * | | | | | | | | t3401: modernize style | Martin von Zweigbergk | 2011-12-11 | 1 | -34/+33 |
| * | | | | | | | | t3040 (subprojects-basic): fix '&&' chaining, modernize style | Ramkumar Ramachandra | 2011-12-09 | 1 | -72/+72 |
| * | | | | | | | | t1510 (worktree): fix '&&' chaining | Ramkumar Ramachandra | 2011-12-09 | 1 | -3/+3 |
| * | | | | | | | | t3030 (merge-recursive): use test_expect_code | Ramkumar Ramachandra | 2011-12-09 | 1 | -66/+6 |
| * | | | | | | | | test: fix '&&' chaining | Ramkumar Ramachandra | 2011-12-08 | 10 | -17/+17 |
| * | | | | | | | | t3200 (branch): fix '&&' chaining | Ramkumar Ramachandra | 2011-12-08 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'tr/cache-tree' | Junio C Hamano | 2011-12-19 | 10 | -11/+144 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | reset: update cache-tree data when appropriate | Thomas Rast | 2011-12-06 | 2 | -2/+9 |
| * | | | | | | | | | commit: write cache-tree data when writing index anyway | Thomas Rast | 2011-12-06 | 2 | -1/+3 |
| * | | | | | | | | | Refactor cache_tree_update idiom from commit | Thomas Rast | 2011-12-06 | 5 | -11/+21 |