summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* branch: clean up commit flags after merge-filter walkjk/branch-verbose-mergedJeff King2014-09-182-14/+48
* git-svn: delay term initializationEric Wong2014-09-141-7/+11
* git svn: find-rev allows short switches for near matchesEric Wong2014-09-142-2/+4
* git-svn.txt: Remove mentions of repack optionsLawrence Velázquez2014-09-141-15/+0
* git svn: info: correctly handle absolute path argsEric Wong2014-09-142-6/+63
* git-svn: branch: avoid systematic prompt for cert/passMonard Vong2014-09-141-1/+3
* Update draft release notes to 2.2Junio C Hamano2014-09-111-1/+42
* Merge branch 'br/imap-send-simplify-tunnel-child-process'Junio C Hamano2014-09-111-10/+9
|\
| * imap-send: simplify v_issue_imap_cmd() and get_cmd_result() using starts_with()br/imap-send-simplify-tunnel-child-processRené Scharfe2014-09-021-2/+2
| * imap-send.c: imap_folder -> imap_server_conf.folderBernhard Reiter2014-08-201-5/+5
| * git-imap-send: simplify tunnel constructionBernhard Reiter2014-08-181-3/+2
* | Merge branch 'jk/name-decoration-alloc'Junio C Hamano2014-09-114-21/+29
|\ \
| * | log-tree: use FLEX_ARRAY in name_decorationjk/name-decoration-allocJeff King2014-08-272-2/+2
| * | log-tree: make name_decoration hash staticJeff King2014-08-263-5/+10
| * | log-tree: make add_name_decoration a public functionJeff King2014-08-263-14/+17
* | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'Junio C Hamano2014-09-112-21/+27
|\ \ \
| * | | checkout -m: attempt merge when deletion of path was stagedjn/unpack-trees-checkout-m-carry-deletionJonathan Nieder2014-08-252-5/+23
| * | | unpack-trees: use 'cuddled' style for if-else cascadeJonathan Nieder2014-08-131-8/+4
| * | | unpack-trees: simplify 'all other failures' caseStefan Beller2014-08-131-10/+2
* | | | Merge branch 'rs/list-optim'Junio C Hamano2014-09-112-3/+7
|\ \ \ \
| * | | | walker: avoid quadratic list insertion in mark_completers/list-optimRené Scharfe2014-08-251-2/+4
| * | | | sha1_name: avoid quadratic list insertion in handle_one_refRené Scharfe2014-08-251-1/+2
| | |/ / | |/| |
* | | | Merge branch 'jk/fast-import-fixes'Junio C Hamano2014-09-111-4/+7
|\ \ \ \
| * | | | fast-import: fix buffer overflow in dump_tagsjk/top-level-refs-cleanupjk/fast-import-fixesJeff King2014-08-251-4/+6
| * | | | fast-import: clean up pack_data pointer in end_packfileJeff King2014-08-251-4/+7
* | | | | Merge branch 'jk/prune-top-level-refs-after-packing'Junio C Hamano2014-09-112-1/+8
|\ \ \ \ \
| * | | | | pack-refs: prune top-level refs like "refs/foo"jk/prune-top-level-refs-after-packingJeff King2014-08-252-1/+9
| |/ / / /
* | | | | Merge branch 'nd/large-blobs'Junio C Hamano2014-09-119-37/+125
|\ \ \ \ \
| * | | | | diff: shortcut for diff'ing two binary SHA-1 objectsnd/large-blobsNguyễn Thái Ngọc Duy2014-08-182-0/+23
| * | | | | diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy2014-08-185-11/+27
| * | | | | diff.c: allow to pass more flags to diff_populate_filespecNguyễn Thái Ngọc Duy2014-08-183-9/+13
| * | | | | sha1_file.c: do not die failing to malloc in unpack_compressed_entryNguyễn Thái Ngọc Duy2014-08-182-1/+9
| * | | | | wrapper.c: introduce gentle xmallocz that does not die()Nguyễn Thái Ngọc Duy2014-08-182-16/+53
* | | | | | Merge branch 'nd/fetch-pass-quiet-to-gc-child-process'Junio C Hamano2014-09-111-4/+6
|\ \ \ \ \ \
| * | | | | | fetch: silence git-gc if --quiet is givennd/fetch-pass-quiet-to-gc-child-processNguyễn Thái Ngọc Duy2014-08-181-0/+2
| * | | | | | fetch: convert argv_gc_auto to struct argv_arrayNguyễn Thái Ngọc Duy2014-08-181-4/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dt/cache-tree-repair'Junio C Hamano2014-09-116-22/+184
|\ \ \ \ \ \
| * | | | | | cache-tree: do not try to use an invalidated subtree info to build a treeJunio C Hamano2014-09-032-1/+14
| * | | | | | cache-tree: Write updated cache-tree after commitDavid Turner2014-07-142-16/+119
| * | | | | | cache-tree: subdirectory testsDavid Turner2014-07-111-3/+23
| * | | | | | test-dump-cache-tree: invalid trees are not errorsDavid Turner2014-07-081-2/+2
| * | | | | | cache-tree: create/update cache-tree on checkoutDavid Turner2014-07-074-4/+36
* | | | | | | Merge branch 'rs/ref-transaction-1'Junio C Hamano2014-09-1111-248/+398
|\ \ \ \ \ \ \
| * | | | | | | update-ref --stdin: pass transaction around explicitlyrs/ref-transaction-1Jonathan Nieder2014-09-031-12/+15
| * | | | | | | update-ref --stdin: narrow scope of err strbufJonathan Nieder2014-09-031-1/+10
| * | | | | | | refs.c: make delete_ref use a transactionRonnie Sahlberg2014-09-031-21/+14
| * | | | | | | refs.c: make prune_ref use a transaction to delete the refRonnie Sahlberg2014-09-032-9/+32
| * | | | | | | refs.c: remove lock_ref_sha1Ronnie Sahlberg2014-09-031-10/+5
| * | | | | | | refs.c: remove the update_ref_write functionRonnie Sahlberg2014-09-031-26/+8
| * | | | | | | refs.c: remove the update_ref_lock functionRonnie Sahlberg2014-09-031-24/+6