summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King2012-05-081-1/+15
|\
| * status: respect "-b" for porcelain formatJeff King2012-05-081-1/+6
| * status: fix null termination with "-b"Jeff King2012-05-081-0/+9
| * Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-033-8/+69
| |\
| * \ Merge branch 'cb/http-multi-curl-auth' into maintJunio C Hamano2012-05-031-5/+10
| |\ \
| * \ \ Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-031-0/+30
| |\ \ \
| * \ \ \ Merge branch 'pw/fast-import-dataref-parsing' into maintJunio C Hamano2012-05-011-0/+287
| |\ \ \ \
| * \ \ \ \ Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-012-0/+97
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'lp/maint-diff-three-dash-with-graph' into maintJunio C Hamano2012-05-011-0/+290
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/rebase-i-submodule-conflict-only' into maintJunio C Hamano2012-05-011-0/+30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/run-command-eacces' into maintJunio C Hamano2012-04-261-0/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-261-0/+54
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maintJunio C Hamano2012-04-261-5/+22
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-261-0/+16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-261-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-p-skip-conflicts' into maintJunio C Hamano2012-04-261-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-261-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2012-04-261-0/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintJunio C Hamano2012-04-261-4/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'zj/diff-empty-chmod'Junio C Hamano2012-05-071-18/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t4006: Windows do not have /dev/zeroJohannes Sixt2012-05-021-1/+1
| * | | | | | | | | | | | | | | | | | diff --stat: report mode-only changes for binary files like text filesZbigniew Jędrzejewski-Szmek2012-05-011-7/+1
| * | | | | | | | | | | | | | | | | | tests: check --[short]stat output after chmodZbigniew Jędrzejewski-Szmek2012-05-011-0/+37
| * | | | | | | | | | | | | | | | | | test: modernize style of t4006Zbigniew Jędrzejewski-Szmek2012-05-011-16/+14
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-tformat-with-z'Junio C Hamano2012-05-071-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | log-tree: the previous one is still not quite rightJunio C Hamano2012-05-011-0/+16
| * | | | | | | | | | | | | | | | | | | log-tree: use custom line terminator in line termination modeJan Krüger2012-05-011-0/+12
* | | | | | | | | | | | | | | | | | | | Merge branch 'th/difftool-diffall'Junio C Hamano2012-05-071-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | difftool: print list of valid tools with '--tool-help'Tim Henigan2012-04-231-0/+5
| * | | | | | | | | | | | | | | | | | | | difftool: teach difftool to handle directory diffsTim Henigan2012-04-231-0/+39
| * | | | | | | | | | | | | | | | | | | | difftool: add '--no-gui' optionTim Henigan2012-03-231-0/+13
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-push-progress'Junio C Hamano2012-05-031-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t5541: test more combinations of --progressJeff King2012-05-011-2/+25
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/columns'Junio C Hamano2012-05-034-0/+325
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | tag: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+44
| * | | | | | | | | | | | | | | | | | | | | | status: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+24
| * | | | | | | | | | | | | | | | | | | | | | branch: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+77
| * | | | | | | | | | | | | | | | | | | | | | column: add dense layout supportNguyễn Thái Ngọc Duy2012-04-271-0/+48
| * | | | | | | | | | | | | | | | | | | | | | t9002: work around shells that are unable to set COLUMNS to 1Zbigniew Jędrzejewski-Szmek2012-04-271-2/+3
| * | | | | | | | | | | | | | | | | | | | | | column: add columnar layoutNguyễn Thái Ngọc Duy2012-04-271-0/+86
| * | | | | | | | | | | | | | | | | | | | | | Add column layout skeleton and git-columnNguyễn Thái Ngọc Duy2012-04-271-0/+45
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-gitweb-test-use-sane-perl'Junio C Hamano2012-05-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t/gitweb-lib: use $PERL_PATH to run gitwebJeff King2012-05-011-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'zj/diff-stat-smaller-num-columns'Junio C Hamano2012-05-0275-341/+360
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek2012-04-3075-341/+360
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-various'Junio C Hamano2012-05-023-5/+242
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | git p4: submit files with wildcardsPete Wyckoff2012-04-302-0/+139
| * | | | | | | | | | | | | | | | | | | | | | | | git p4: fix writable file after rename or copyPete Wyckoff2012-04-302-5/+8
| * | | | | | | | | | | | | | | | | | | | | | | | git p4: test submitPete Wyckoff2012-04-301-0/+92
| * | | | | | | | | | | | | | | | | | | | | | | | git p4: bring back files in deleted client directoryPete Wyckoff2012-04-301-2/+5
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |