Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/threaded-index-pack' | Junio C Hamano | 2012-05-14 | 1 | -0/+40 |
|\ | |||||
| * | index-pack: support multithreaded delta resolving | Nguyễn Thái Ngọc Duy | 2012-05-07 | 1 | -0/+40 |
* | | Merge branch 'ef/checkout-empty' | Junio C Hamano | 2012-05-11 | 1 | -0/+11 |
|\ \ | |||||
| * | | checkout: do not corrupt HEAD on empty repo | Erik Faye-Lund | 2012-05-08 | 1 | -0/+11 |
* | | | Merge branch 'jk/maint-reflog-walk-count-vs-time' | Junio C Hamano | 2012-05-11 | 1 | -4/+57 |
|\ \ \ | |||||
| * | | | reflog-walk: tell explicit --date=default from not having --date at all | Junio C Hamano | 2012-05-07 | 1 | -4/+4 |
| * | | | reflog-walk: always make HEAD@{0} show indexed selectors | Jeff King | 2012-05-04 | 1 | -0/+8 |
| * | | | log: respect date_mode_explicit with --format:%gd | Jeff King | 2012-05-04 | 1 | -1/+1 |
| * | | | t1411: add more selector index/date tests | Jeff King | 2012-05-04 | 1 | -0/+45 |
* | | | | Merge branch 'jk/status-porcelain-z-b' | Junio C Hamano | 2012-05-10 | 1 | -1/+15 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'jk/maint-status-porcelain-z-b' into HEAD | Jeff King | 2012-05-08 | 1 | -1/+15 |
| |\ \ \ \ | |||||
| | * | | | | status: respect "-b" for porcelain format | Jeff King | 2012-05-08 | 1 | -1/+6 |
| | * | | | | status: fix null termination with "-b" | Jeff King | 2012-05-08 | 1 | -0/+9 |
| | * | | | | Merge branch 'jc/merge-reduce-parents-early' into maint | Junio C Hamano | 2012-05-03 | 3 | -8/+69 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'cb/http-multi-curl-auth' into maint | Junio C Hamano | 2012-05-03 | 1 | -5/+10 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maint | Junio C Hamano | 2012-05-03 | 1 | -0/+30 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'pw/fast-import-dataref-parsing' into maint | Junio C Hamano | 2012-05-01 | 1 | -0/+287 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'it/fetch-pack-many-refs' into maint | Junio C Hamano | 2012-05-01 | 2 | -0/+97 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'lp/maint-diff-three-dash-with-graph' into maint | Junio C Hamano | 2012-05-01 | 1 | -0/+290 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rebase-i-submodule-conflict-only' into maint | Junio C Hamano | 2012-05-01 | 1 | -0/+30 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/run-command-eacces' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/push-upstream-sanity' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+54 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint | Junio C Hamano | 2012-04-26 | 1 | -5/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-no-rename-empty' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/commit-unedited-template' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-p-skip-conflicts' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/commit-hook-authorship' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/maint-word-diff-regex-sticky' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint | Junio C Hamano | 2012-04-26 | 1 | -4/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/checkout-detach-count' | Junio C Hamano | 2012-05-10 | 1 | -5/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | checkout (detached): truncate list of orphaned commits at the new HEAD | Johannes Sixt | 2012-05-04 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | t2020-checkout-detach: check for the number of orphaned commits | Johannes Sixt | 2012-05-04 | 1 | -5/+16 |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/stream-to-archive' | Junio C Hamano | 2012-05-10 | 2 | -30/+60 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | t5000: rationalize unzip tests | René Scharfe | 2012-05-03 | 1 | -40/+39 |
| * | | | | | | | | | | | | | | | | | | | | | archive-zip: streaming for deflated files | René Scharfe | 2012-05-03 | 2 | -0/+11 |
| * | | | | | | | | | | | | | | | | | | | | | archive-zip: streaming for stored files | René Scharfe | 2012-05-03 | 2 | -0/+10 |
| * | | | | | | | | | | | | | | | | | | | | | archive-tar: stream large blobs to tar file | Nguyễn Thái Ngọc Duy | 2012-05-03 | 2 | -0/+10 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'zj/diff-empty-chmod' | Junio C Hamano | 2012-05-07 | 1 | -18/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | t4006: Windows do not have /dev/zero | Johannes Sixt | 2012-05-02 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | diff --stat: report mode-only changes for binary files like text files | Zbigniew Jędrzejewski-Szmek | 2012-05-01 | 1 | -7/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | tests: check --[short]stat output after chmod | Zbigniew Jędrzejewski-Szmek | 2012-05-01 | 1 | -0/+37 |
| * | | | | | | | | | | | | | | | | | | | | | | test: modernize style of t4006 | Zbigniew Jędrzejewski-Szmek | 2012-05-01 | 1 | -16/+14 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-tformat-with-z' | Junio C Hamano | 2012-05-07 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | log-tree: the previous one is still not quite right | Junio C Hamano | 2012-05-01 | 1 | -0/+16 |
| * | | | | | | | | | | | | | | | | | | | | | | | log-tree: use custom line terminator in line termination mode | Jan Krüger | 2012-05-01 | 1 | -0/+12 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'th/difftool-diffall' | Junio C Hamano | 2012-05-07 | 1 | -0/+57 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | difftool: print list of valid tools with '--tool-help' | Tim Henigan | 2012-04-23 | 1 | -0/+5 |
| * | | | | | | | | | | | | | | | | | | | | | | | | difftool: teach difftool to handle directory diffs | Tim Henigan | 2012-04-23 | 1 | -0/+39 |
| * | | | | | | | | | | | | | | | | | | | | | | | | difftool: add '--no-gui' option | Tim Henigan | 2012-03-23 | 1 | -0/+13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-push-progress' | Junio C Hamano | 2012-05-03 | 1 | -2/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |