summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Test the current state of the cache-tree optimizationThomas Rast2011-12-061-0/+95
| * Add test-scrap-cache-treeThomas Rast2011-12-063-0/+19
* | Merge branch 'jk/credentials'Junio C Hamano2011-12-1928-100/+2427
|\ \
| * | t: add test harness for external credential helpersJeff King2011-12-121-0/+39
| * | credentials: add "store" helperJeff King2011-12-126-0/+248
| * | strbuf: add strbuf_add*_urlencodeJeff King2011-12-122-0/+42
| * | Makefile: unix sockets may not available on some platformsJohannes Sixt2011-12-122-3/+16
| * | credentials: add "cache" helperJeff King2011-12-1112-5/+812
| * | docs: end-user documentation for the credential subsystemJeff King2011-12-113-0/+195
| * | credential: make relevance of http path configurableJeff King2011-12-114-2/+46
| * | credential: add credential.*.usernameJeff King2011-12-113-0/+33
| * | credential: apply helper configJeff King2011-12-114-1/+119
| * | http: use credential API to get passwordsJeff King2011-12-112-99/+52
| * | credential: add function for parsing url componentsJeff King2011-12-113-0/+57
| * | introduce credentials APIJeff King2011-12-118-0/+773
| * | t5550: fix typoJeff King2011-12-111-1/+1
| * | test-lib: add test_config_global variantJeff King2011-12-111-0/+5
* | | git-p4: fix skipSubmitEdit regressionPete Wyckoff2011-12-172-8/+34
* | | Update draft release notes to 1.7.9Junio C Hamano2011-12-161-1/+18
* | | Merge branch 'jc/commit-amend-no-edit'Junio C Hamano2011-12-162-156/+172
|\ \ \
| * | | test: commit --amend should honor --no-editjc/commit-amend-no-editJonathan Nieder2011-12-081-0/+40
| * | | commit: honour --no-editJunio C Hamano2011-12-081-4/+5
| * | | t7501 (commit): modernize styleJonathan Nieder2011-12-081-133/+127
| * | | test: remove a porcelain test that hard-codes commit namesJonathan Nieder2011-12-081-20/+0
| * | | test: add missing "&&" after echo commandJonathan Nieder2011-12-081-6/+7
* | | | Merge branch 'jc/stream-to-pack'Junio C Hamano2011-12-1616-134/+516
|\ \ \ \
| * | | | bulk-checkin: replace fast-import based implementationjc/stream-to-packJunio C Hamano2011-12-0111-78/+403
| * | | | csum-file: introduce sha1file_checkpointJunio C Hamano2011-11-303-17/+37
| * | | | finish_tmp_packfile(): a helper functionJunio C Hamano2011-10-283-23/+42
| * | | | create_tmp_packfile(): a helper functionJunio C Hamano2011-10-283-9/+16
| * | | | write_pack_header(): a helper functionJunio C Hamano2011-10-283-6/+17
* | | | | Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Junio C Hamano2011-12-161-13/+23
|\ \ \ \ \
| * | | | | rebase -i: interrupt rebase when "commit --amend" failed during "reword"aw/rebase-i-stop-on-failure-to-amendAndrew Wong2011-11-301-13/+23
* | | | | | Merge branch 'jh/fast-import-notes'Junio C Hamano2011-12-162-8/+83
|\ \ \ \ \ \
| * | | | | | fast-import: Fix incorrect fanout level when modifying existing notes refsjh/fast-import-notesJohan Herland2011-11-282-7/+29
| * | | | | | t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handlingJohan Herland2011-11-281-0/+54
| * | | | | | t9301: Fix testcase covering up a bug in fast-import's notes fanout handlingJohan Herland2011-11-281-7/+6
* | | | | | | Merge branch 'jk/upload-archive-use-start-command'Junio C Hamano2011-12-164-36/+19
|\ \ \ \ \ \ \
| * | | | | | | upload-archive: use start_command instead of forkjk/upload-archive-use-start-commandJeff King2011-11-214-36/+19
* | | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2011-12-161-45/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | gitk: Make vi-style keybindings more vi-likeJonathan Nieder2011-10-081-6/+6
| * | | | | | | | gitk: Make "touching paths" search support backslashesYggy King2011-07-241-1/+6
| * | | | | | | | gitk: Show modified files with separate work treeMartin von Zweigbergk2011-07-241-6/+11
| * | | | | | | | gitk: Simplify calculation of gitdirMartin von Zweigbergk2011-07-241-14/+1
| * | | | | | | | gitk: Run 'git rev-parse --git-dir' only onceMartin von Zweigbergk2011-07-241-2/+4
| * | | | | | | | gitk: Put temporary directory inside .gitMartin von Zweigbergk2011-07-241-2/+1