summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/alias-in-bare'Junio C Hamano2013-03-251-0/+19
|\
| * setup: suppress implicit "." work-tree for bare reposJeff King2013-03-081-0/+19
* | Merge branch 'jc/push-follow-tag'Junio C Hamano2013-03-251-0/+73
|\ \
| * | push: --follow-tagsJunio C Hamano2013-03-051-0/+73
* | | Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano2013-03-251-0/+54
|\ \ \
| * | | tests: make sure rename pretty print worksAntoine Pelisse2013-03-061-0/+54
* | | | Merge branch 'jl/submodule-deinit'Junio C Hamano2013-03-251-0/+100
|\ \ \ \
| * | | | submodule: add 'deinit' commandJens Lehmann2013-03-041-0/+100
* | | | | Merge branch 'pe/pull-rebase-v-q'Junio C Hamano2013-03-251-0/+27
|\ \ \ \ \
| * | | | | pull: Apply -q and -v options to rebase mode as wellPeter Eisentraut2013-03-161-0/+27
* | | | | | Merge branch 'we/submodule-update-prefix-output'Junio C Hamano2013-03-211-1/+2
|\ \ \ \ \ \
| * | | | | | submodule update: when using recursion, show full pathWilliam Entriken2013-03-031-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs/zip-compresssed-size-with-export-subst'Junio C Hamano2013-03-211-0/+6
|\ \ \ \ \ \
| * | | | | | archive-zip: fix compressed size for stored export-subst filesRené Scharfe2013-02-271-0/+6
* | | | | | | Merge branch 'rt/commit-cleanup-config'Junio C Hamano2013-03-211-8/+16
|\ \ \ \ \ \ \
| * | | | | | | t7502: perform commits using alternate editor in a subshellBrandon Casey2013-02-231-8/+16
* | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-03-211-0/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: segfault fixes and validationNguyễn Thái Ngọc Duy2013-02-231-0/+21
* | | | | | | | | Merge branch 'da/difftool-fixes'Junio C Hamano2013-03-211-199/+169
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t7800: "defaults" is no longer a builtin tool nameDavid Aguilar2013-02-211-2/+2
| * | | | | | | | | t7800: modernize testsDavid Aguilar2013-02-201-198/+168
| * | | | | | | | | t7800: update copyright noticeDavid Aguilar2013-02-191-1/+1
* | | | | | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option'Junio C Hamano2013-03-211-4/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-commit: only append a newline to -m mesg if necessaryBrandon Casey2013-02-191-1/+1
| * | | | | | | | | | t7502: demonstrate breakage with a commit message with trailing newlinesBrandon Casey2013-02-191-3/+11
| * | | | | | | | | | t/t7502: compare entire commit message with what was expectedBrandon Casey2013-02-191-2/+2
* | | | | | | | | | | Merge branch 'nd/count-garbage'Junio C Hamano2013-03-211-0/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | count-objects: report garbage files in pack directory tooNguyễn Thái Ngọc Duy2013-02-151-0/+26
* | | | | | | | | | | | Merge branch 'jc/fetch-raw-sha1'Junio C Hamano2013-03-211-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fetch: fetch objects by their exact SHA-1 object namesJunio C Hamano2013-02-071-0/+34
* | | | | | | | | | | | | Merge branch 'tb/document-status-u-tradeoff'Junio C Hamano2013-03-213-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-163-0/+3
* | | | | | | | | | | | | | Merge branch 'jc/add-2.0-u-A-sans-pathspec' (early part)Junio C Hamano2013-03-191-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t2200: check that "add -u" limits itself to subdirectoryJeff King2013-03-141-0/+16
* | | | | | | | | | | | | | | Merge branch 'da/downcase-u-in-usage'Junio C Hamano2013-03-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tests: use a lowercase "usage:" stringDavid Aguilar2013-02-242-2/+2
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | t1507: Test that branchname@{upstream} is interpreted as branchKacper Kornet2013-03-171-0/+4
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | perf: update documentation of GIT_PERF_REPEAT_COUNTAntoine Pelisse2013-03-091-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'mh/maint-ceil-absolute' into maintJunio C Hamano2013-03-071-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Sync with 1.8.1.5Junio C Hamano2013-03-011-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Make !pattern in .gitattributes non-fatalThomas Rast2013-03-011-1/+2
* | | | | | | | | | | | | Merge branch 'mh/maint-ceil-absolute'Junio C Hamano2013-02-271-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Provide a mechanism to turn off symlink resolution in ceiling pathsMichael Haggerty2013-02-221-0/+17
* | | | | | | | | | | | | Sync with 'maint'Junio C Hamano2013-02-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'sp/smart-http-content-type-check' into maintJunio C Hamano2013-02-254-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/combine-diff-many-parents' into maintJunio C Hamano2013-02-251-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Documentation: "advice" is uncountableGreg Price2013-02-251-1/+1
| * | | | | | | | | | | | | | Merge branch 'mz/pick-unborn' into maintJunio C Hamano2013-02-079-40/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \