Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge git://ozlabs.org/~paulus/gitk | Junio C Hamano | 2014-10-30 | 1 | -69/+23 |
|\ | |||||
| * | gitk: Remove boilerplate for configuration variables | Max Kirillov | 2014-10-30 | 1 | -68/+20 |
| * | gitk: Show detached HEAD if --all is specified | Max Kirillov | 2014-10-30 | 1 | -0/+2 |
| * | gitk: Do not depend on Cygwin's "kill" command on Windows | Sebastian Schuberth | 2014-10-30 | 1 | -1/+1 |
* | | Sync with Git 2.1.3 | Junio C Hamano | 2014-10-29 | 2 | -1/+28 |
|\ \ | |||||
| * | | Git 2.1.3v2.1.3 | Junio C Hamano | 2014-10-29 | 4 | -3/+30 |
| * | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint | Junio C Hamano | 2014-10-29 | 2 | -0/+10 |
| |\ \ | |||||
| * \ \ | Merge branch 'da/mergetool-meld' into maint | Junio C Hamano | 2014-10-29 | 2 | -2/+16 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rm/gitweb-start-form' into maint | Junio C Hamano | 2014-10-29 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'bc/asciidoc-pretty-formats-fix' into maint | Junio C Hamano | 2014-10-29 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rs/daemon-fixes' into maint | Junio C Hamano | 2014-10-29 | 1 | -18/+15 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | Update draft release notes to 2.2 | Junio C Hamano | 2014-10-29 | 1 | -0/+17 |
* | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2014-10-29 | 4 | -1/+85 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | difftool: add support for --trust-exit-code | David Aguilar | 2014-10-28 | 4 | -0/+75 |
| * | | | | | | | | difftool--helper: exit when reading a prompt answer fails | Johannes Sixt | 2014-10-27 | 2 | -1/+10 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'rb/pack-window-memory-config-doc' | Junio C Hamano | 2014-10-29 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config.txt: pack.windowmemory limit applies per-threadrb/pack-window-memory-config-doc | Robert de Bath | 2014-10-28 | 1 | -4/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'mg/lib-gpg-ro-safety' | Junio C Hamano | 2014-10-29 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t/lib-gpg: make gpghome files writablemg/lib-gpg-ro-safety | Michael J Gruber | 2014-10-27 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'dm/port2zos' | Junio C Hamano | 2014-10-29 | 3 | -3/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | compat/bswap.h: detect endianness from XL C compiler macrosdm/port2zos | David Michael | 2014-10-27 | 1 | -0/+4 |
| * | | | | | | | | | Makefile: reorder linker flags in the git executable rule | David Michael | 2014-10-27 | 1 | -2/+2 |
| * | | | | | | | | | git-compat-util.h: support variadic macros with the XL C compiler | David Michael | 2014-10-27 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'oc/mergetools-beyondcompare' | Junio C Hamano | 2014-10-29 | 4 | -27/+28 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | mergetool: rename bc3 to bcoc/mergetools-beyondcompare | Junio C Hamano | 2014-10-21 | 4 | -27/+28 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/prune-mtime' | Junio C Hamano | 2014-10-29 | 23 | -436/+836 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | drop add_object_array_with_mode | Jeff King | 2014-10-19 | 2 | -7/+1 |
| * | | | | | | | | | revision: remove definition of unused 'add_object' function | Ramsay Jones | 2014-10-19 | 2 | -15/+0 |
| * | | | | | | | | | pack-objects: double-check options before discarding objects | Jeff King | 2014-10-19 | 1 | -0/+2 |
| * | | | | | | | | | repack: pack objects mentioned by the index | Jeff King | 2014-10-19 | 3 | -0/+22 |
| * | | | | | | | | | pack-objects: use argv_array | Jeff King | 2014-10-19 | 1 | -10/+10 |
| * | | | | | | | | | reachable: use revision machinery's --indexed-objects code | Jeff King | 2014-10-19 | 1 | -51/+1 |
| * | | | | | | | | | rev-list: add --indexed-objects option | Jeff King | 2014-10-19 | 4 | -0/+80 |
| * | | | | | | | | | rev-list: document --reflog option | Jeff King | 2014-10-19 | 1 | -0/+4 |
| * | | | | | | | | | t5516: test pushing a tag of an otherwise unreferenced blob | Jeff King | 2014-10-19 | 1 | -0/+13 |
| * | | | | | | | | | traverse_commit_list: support pending blobs/trees with paths | Jeff King | 2014-10-19 | 2 | -9/+32 |
| * | | | | | | | | | make add_object_array_with_context interface more sane | Jeff King | 2014-10-16 | 3 | -20/+15 |
| * | | | | | | | | | write_sha1_file: freshen existing objects | Jeff King | 2014-10-16 | 2 | -7/+71 |
| * | | | | | | | | | pack-objects: match prune logic for discarding objects | Jeff King | 2014-10-16 | 4 | -40/+98 |
| * | | | | | | | | | pack-objects: refactor unpack-unreachable expiration check | Jeff King | 2014-10-16 | 1 | -5/+12 |
| * | | | | | | | | | prune: keep objects reachable from recent objects | Jeff King | 2014-10-16 | 5 | -3/+204 |
| * | | | | | | | | | sha1_file: add for_each iterators for loose and packed objects | Jeff King | 2014-10-16 | 2 | -0/+73 |
| * | | | | | | | | | count-objects: use for_each_loose_file_in_objdir | Jeff King | 2014-10-16 | 1 | -71/+30 |
| * | | | | | | | | | count-objects: do not use xsize_t when counting object size | Jeff King | 2014-10-16 | 1 | -1/+1 |
| * | | | | | | | | | prune-packed: use for_each_loose_file_in_objdir | Jeff King | 2014-10-16 | 1 | -46/+23 |
| * | | | | | | | | | reachable: mark index blobs as SEEN | Jeff King | 2014-10-16 | 1 | -1/+6 |
| * | | | | | | | | | prune: factor out loose-object directory traversal | Jeff King | 2014-10-16 | 3 | -61/+143 |
| * | | | | | | | | | reachable: reuse revision.c "add all reflogs" code | Jeff King | 2014-10-16 | 3 | -25/+4 |
| * | | | | | | | | | reachable: use traverse_commit_list instead of custom walk | Jeff King | 2014-10-16 | 1 | -113/+17 |
| * | | | | | | | | | clean up name allocation in prepare_revision_walk | Jeff King | 2014-10-16 | 1 | -7/+7 |