Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 '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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | t5541: test more combinations of --progress | Jeff King | 2012-05-01 | 1 | -2/+25 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/columns' | Junio C Hamano | 2012-05-03 | 4 | -0/+325 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | tag: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+44 |
| * | | | | | | | | | | | | | | | | | | | | | | status: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+24 |
| * | | | | | | | | | | | | | | | | | | | | | | branch: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+77 |
| * | | | | | | | | | | | | | | | | | | | | | | column: add dense layout support | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+48 |
| * | | | | | | | | | | | | | | | | | | | | | | t9002: work around shells that are unable to set COLUMNS to 1 | Zbigniew Jędrzejewski-Szmek | 2012-04-27 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | column: add columnar layout | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+86 |
| * | | | | | | | | | | | | | | | | | | | | | | Add column layout skeleton and git-column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+45 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-gitweb-test-use-sane-perl' | Junio C Hamano | 2012-05-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | t/gitweb-lib: use $PERL_PATH to run gitweb | Jeff King | 2012-05-01 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'zj/diff-stat-smaller-num-columns' | Junio C Hamano | 2012-05-02 | 75 | -341/+360 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | diff --stat: use less columns for change counts | Zbigniew Jędrzejewski-Szmek | 2012-04-30 | 75 | -341/+360 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-various' | Junio C Hamano | 2012-05-02 | 3 | -5/+242 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4: submit files with wildcards | Pete Wyckoff | 2012-04-30 | 2 | -0/+139 |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4: fix writable file after rename or copy | Pete Wyckoff | 2012-04-30 | 2 | -5/+8 |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4: test submit | Pete Wyckoff | 2012-04-30 | 1 | -0/+92 |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4: bring back files in deleted client directory | Pete Wyckoff | 2012-04-30 | 1 | -2/+5 |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |