Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maint | Junio C Hamano | 2014-07-10 | 2 | -7/+27 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | repack: s/write_bitmap/&s/ in codejk/repack-pack-keep-objects | Jeff King | 2014-06-10 | 1 | -6/+6 | |
| * | | | | | | repack: respect pack.writebitmaps | Jeff King | 2014-06-10 | 2 | -2/+22 | |
| * | | | | | | repack: do not accidentally pack kept objects by default | Jeff King | 2014-06-10 | 2 | -2/+2 | |
* | | | | | | | Merge branch 'mc/doc-submodule-sync-recurse' into maint | Junio C Hamano | 2014-07-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | submodule: document "sync --recursive"mc/doc-submodule-sync-recurse | Matthew Chen | 2014-06-13 | 1 | -1/+1 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'maint-1.8.5' into maint | Junio C Hamano | 2014-07-02 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | t7300: repair filesystem permissions with test_when_finished | Jeff King | 2014-07-02 | 1 | -2/+2 | |
| * | | | | | | enums: remove trailing ',' after last item in enum | Ronnie Sahlberg | 2014-07-02 | 2 | -2/+2 | |
| |/ / / / / | ||||||
* | | | | | | Git 2.0.1v2.0.1 | Junio C Hamano | 2014-06-25 | 4 | -3/+119 | |
* | | | | | | Merge branch 'na/no-http-test-in-the-middle' into maint | Junio C Hamano | 2014-06-25 | 2 | -59/+100 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | t5538: move http push tests out to t5542na/no-http-test-in-the-middle | Nick Alcock | 2014-05-30 | 2 | -59/+100 | |
* | | | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 | 5 | -8/+108 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignored | Jens Lehmann | 2014-04-07 | 2 | -3/+17 | |
| * | | | | | | | status/commit: show staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 | 4 | -6/+92 | |
* | | | | | | | | Merge branch 'ym/fix-opportunistic-index-update-race' into maint | Junio C Hamano | 2014-06-25 | 6 | -5/+90 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | read-cache.c: verify index file before we opportunistically update itym/fix-opportunistic-index-update-race | Yiannis Marangos | 2014-04-10 | 3 | -1/+69 | |
| * | | | | | | | | wrapper.c: add xpread() similar to xread() | Yiannis Marangos | 2014-04-10 | 4 | -4/+21 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint | Junio C Hamano | 2014-06-25 | 4 | -11/+15 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-merges | Max Kirillov | 2014-05-15 | 4 | -11/+15 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'rr/rebase-autostash-fix' into maint | Junio C Hamano | 2014-06-25 | 3 | -3/+27 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fix | Matthieu Moy | 2014-05-20 | 1 | -0/+15 | |
| * | | | | | | | | rebase -i: handle "Nothing to do" case with autostash | Ramkumar Ramachandra | 2014-05-19 | 2 | -3/+12 | |
* | | | | | | | | | Merge branch 'jc/shortlog-ref-exclude' into maint | Junio C Hamano | 2014-06-25 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | shortlog: allow --exclude=<glob> to be passedjc/shortlog-ref-exclude | Junio C Hamano | 2014-06-04 | 2 | -0/+7 | |
* | | | | | | | | | | Merge branch 'jl/remote-rm-prune' into maint | Junio C Hamano | 2014-06-25 | 3 | -9/+52 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remote prune: optimize "dangling symref" check/warningjl/remote-rm-prune | Jens Lindström | 2014-05-27 | 3 | -2/+25 | |
| * | | | | | | | | | | remote: repack packed-refs once when deleting multiple refs | Jens Lindström | 2014-05-27 | 3 | -3/+21 | |
| * | | | | | | | | | | 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.conflictstylefc/rerere-conflict-style | Felipe Contreras | 2014-04-30 | 1 | -0/+2 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'rs/pack-objects-no-unnecessary-realloc' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | pack-objects: use free()+xcalloc() instead of xrealloc()+memset()rs/pack-objects-no-unnecessary-realloc | René Scharfe | 2014-06-02 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive' into maint | Junio C Hamano | 2014-06-25 | 3 | -1/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitive | David Turner | 2014-05-08 | 2 | -2/+3 | |
| * | | | | | | | | | | | merge-recursive.c: fix case-changing merge bug | David Turner | 2014-05-07 | 2 | -0/+59 | |
* | | | | | | | | | | | | Merge branch 'rs/mailinfo-header-cmp' into maint | Junio C Hamano | 2014-06-25 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | mailinfo: use strcmp() for string comparisonrs/mailinfo-header-cmp | 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 errorsjk/index-pack-report-missing | Jeff King | 2014-05-12 | 1 | -2/+7 | |
* | | | | | | | | | | | | | Merge branch 'nd/index-pack-one-fd-per-thread' into maint | Junio C Hamano | 2014-06-25 | 3 | -18/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | index-pack: work around thread-unsafe pread()nd/index-pack-one-fd-per-thread | Nguyễn Thái Ngọc Duy | 2014-04-16 | 3 | -18/+17 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionsk/spawn-less-case-insensitively-from-grep-O-i | Johannes Schindelin | 2014-05-15 | 1 | -0/+3 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'nd/daemonize-gc' into maint | Junio C Hamano | 2014-06-25 | 1 | -6/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | gc --auto: do not lock refs in the backgroundnd/daemonize-gc | Nguyễn Thái Ngọc Duy | 2014-05-27 | 1 | -6/+20 | |
* | | | | | | | | | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint | Junio C Hamano | 2014-06-25 | 2 | -6/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | move "--follow needs one pathspec" rule to diff_setup_donejk/diff-follow-must-take-one-pathspec | Jeff King | 2014-05-20 | 2 | -6/+5 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/diff-files-assume-unchanged' into maint | Junio C Hamano | 2014-06-25 | 2 | -12/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | run_diff_files: do not look at uninitialized stat datajk/diff-files-assume-unchanged | Jeff King | 2014-05-15 | 2 | -12/+32 | |
| |/ / / / / / / / / / / / / |