Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | Test the current state of the cache-tree optimization | Thomas Rast | 2011-12-06 | 1 | -0/+95 |
| * | | | | | | Add test-scrap-cache-tree | Thomas Rast | 2011-12-06 | 3 | -0/+19 |
* | | | | | | | Merge branch 'jk/credentials' | Junio C Hamano | 2011-12-19 | 28 | -100/+2427 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t: add test harness for external credential helpers | Jeff King | 2011-12-12 | 1 | -0/+39 |
| * | | | | | | | credentials: add "store" helper | Jeff King | 2011-12-12 | 6 | -0/+248 |
| * | | | | | | | strbuf: add strbuf_add*_urlencode | Jeff King | 2011-12-12 | 2 | -0/+42 |
| * | | | | | | | Makefile: unix sockets may not available on some platforms | Johannes Sixt | 2011-12-12 | 2 | -3/+16 |
| * | | | | | | | credentials: add "cache" helper | Jeff King | 2011-12-11 | 12 | -5/+812 |
| * | | | | | | | docs: end-user documentation for the credential subsystem | Jeff King | 2011-12-11 | 3 | -0/+195 |
| * | | | | | | | credential: make relevance of http path configurable | Jeff King | 2011-12-11 | 4 | -2/+46 |
| * | | | | | | | credential: add credential.*.username | Jeff King | 2011-12-11 | 3 | -0/+33 |
| * | | | | | | | credential: apply helper config | Jeff King | 2011-12-11 | 4 | -1/+119 |
| * | | | | | | | http: use credential API to get passwords | Jeff King | 2011-12-11 | 2 | -99/+52 |
| * | | | | | | | credential: add function for parsing url components | Jeff King | 2011-12-11 | 3 | -0/+57 |
| * | | | | | | | introduce credentials API | Jeff King | 2011-12-11 | 8 | -0/+773 |
| * | | | | | | | t5550: fix typo | Jeff King | 2011-12-11 | 1 | -1/+1 |
| * | | | | | | | test-lib: add test_config_global variant | Jeff King | 2011-12-11 | 1 | -0/+5 |
* | | | | | | | | git-p4: fix skipSubmitEdit regression | Pete Wyckoff | 2011-12-17 | 2 | -8/+34 |
* | | | | | | | | Update draft release notes to 1.7.9 | Junio C Hamano | 2011-12-16 | 1 | -1/+18 |
* | | | | | | | | Merge branch 'jc/commit-amend-no-edit' | Junio C Hamano | 2011-12-16 | 2 | -156/+172 |
|\ \ \ \ \ \ \ \ |