Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bg/xcalloc-nmemb-then-size' into maint | Junio C Hamano | 2014-07-22 | 2 | -5/+5 |
|\ | |||||
| * | builtin/remote.c: rearrange xcalloc arguments | Brian Gesiak | 2014-05-27 | 1 | -4/+4 |
| * | builtin/ls-remote.c: rearrange xcalloc arguments | Brian Gesiak | 2014-05-27 | 1 | -1/+1 |
* | | use xmemdupz() to allocate copies of strings given by start and length | René Scharfe | 2014-07-21 | 2 | -7/+2 |
* | | use xcalloc() to allocate zero-initialized memory | René Scharfe | 2014-07-21 | 2 | -4/+2 |
* | | Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maint | Junio C Hamano | 2014-07-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | builtin/clone.c: detect a clone starting at a tag correctly | Junio C Hamano | 2014-06-23 | 1 | -1/+1 |
* | | | Merge branch 'jk/commit-buffer-length' into maint | Junio C Hamano | 2014-07-16 | 11 | -29/+47 |
|\ \ \ | |||||
| * | | | commit: record buffer length in cache | Jeff King | 2014-06-13 | 6 | -6/+18 |
| * | | | use get_commit_buffer everywhere | Jeff King | 2014-06-13 | 3 | -4/+13 |
| * | | | convert logmsg_reencode to get_commit_buffer | Jeff King | 2014-06-13 | 2 | -3/+3 |
| * | | | use get_cached_commit_buffer where appropriate | Jeff King | 2014-06-13 | 1 | -1/+1 |
| * | | | provide a helper to set the commit buffer | Jeff King | 2014-06-13 | 1 | -1/+1 |
| * | | | provide a helper to free commit buffer | Jeff King | 2014-06-13 | 4 | -9/+6 |
| * | | | logmsg_reencode: return const buffer | Jeff King | 2014-06-12 | 2 | -2/+2 |
| * | | | do not create "struct commit" with xcalloc | Jeff King | 2014-06-12 | 1 | -1/+1 |
| * | | | commit_tree: take a pointer/len pair rather than a const strbuf | Jeff King | 2014-06-12 | 3 | -8/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'maint-1.9' into maint | Junio C Hamano | 2014-07-16 | 1 | -7/+5 |
|\ \ \ | |||||
| * \ \ | Merge branch 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2014-07-16 | 2 | -8/+6 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | annotate: use argv_array | René Scharfe | 2014-07-16 | 1 | -7/+5 |
* | | | | Merge branch 'jk/repack-pack-keep-objects' into maint | Junio C Hamano | 2014-07-10 | 1 | -5/+9 |
|\ \ \ \ | |||||
| * | | | | repack: s/write_bitmap/&s/ in code | Jeff King | 2014-06-10 | 1 | -6/+6 |
| * | | | | repack: respect pack.writebitmaps | Jeff King | 2014-06-10 | 1 | -1/+5 |
| * | | | | repack: do not accidentally pack kept objects by default | Jeff King | 2014-06-10 | 1 | -1/+1 |
* | | | | | Merge branch 'maint-1.8.5' into maint | Junio C Hamano | 2014-07-02 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | enums: remove trailing ',' after last item in enum | Ronnie Sahlberg | 2014-07-02 | 1 | -1/+1 |
* | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+16 |
|\ \ \ \ \ | |||||
| * | | | | | commit -m: commit staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 | 1 | -2/+16 |
* | | | | | | Merge branch 'ym/fix-opportunistic-index-update-race' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | wrapper.c: add xpread() similar to xread() | Yiannis Marangos | 2014-04-10 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jl/remote-rm-prune' into maint | Junio C Hamano | 2014-06-25 | 1 | -7/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remote prune: optimize "dangling symref" check/warning | Jens Lindström | 2014-05-27 | 1 | -1/+6 |
| * | | | | | | remote: repack packed-refs once when deleting multiple refs | Jens Lindström | 2014-05-27 | 1 | -2/+18 |
| * | | | | | | remote rm: delete remote configuration as the last | Jens Lindström | 2014-05-23 | 1 | -4/+6 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'fc/rerere-conflict-style' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rerere: fix for merge.conflictstyle | Felipe Contreras | 2014-04-30 | 1 | -0/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'dt/merge-recursive-case-insensitive' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mv: allow renaming to fix case on case insensitive filesystems | David Turner | 2014-05-08 | 1 | -1/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'rs/mailinfo-header-cmp' into maint | Junio C Hamano | 2014-06-25 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mailinfo: use strcmp() for string comparison | René Scharfe | 2014-06-02 | 1 | -3/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/index-pack-report-missing' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | index-pack: distinguish missing objects from type errors | Jeff King | 2014-05-12 | 1 | -2/+7 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'jl/nor-or-nand-and' into maint | Junio C Hamano | 2014-04-09 | 6 | -8/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mh/update-ref-batch-create-fix' into maint | Junio C Hamano | 2014-04-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'bp/commit-p-editor' into maint | Junio C Hamano | 2014-04-08 | 5 | -17/+38 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/mv-submodules-fix' into maint | Junio C Hamano | 2014-04-03 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-error-message' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/shallow-update-fix' into maint | Junio C Hamano | 2014-04-03 | 1 | -12/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-one-fd-per-thread' into maint | Junio C Hamano | 2014-06-25 | 1 | -10/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | index-pack: work around thread-unsafe pread() | Nguyễn Thái Ngọc Duy | 2014-04-16 | 1 | -10/+17 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |