aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'dt/pre-refs-backend'Junio C Hamano2016-04-25
|\
| * refs: on symref reflog expire, lock symref not referrentDavid Turner2016-04-10
| * t1430: improve test coverage of deletion of badly-named refsMichael Haggerty2016-04-10
| * t1430: test for-each-ref in the presence of badly-named refsMichael Haggerty2016-04-10
| * t1430: don't rely on symbolic-ref for creating broken symrefsMichael Haggerty2016-04-10
| * t1430: clean up broken refs/tags/shadowMichael Haggerty2016-04-10
| * t1430: test the output and error of some commands more carefullyMichael Haggerty2016-04-10
* | Merge branch 'jc/rerere-multi'Junio C Hamano2016-04-25
|\ \
| * | rerere: adjust 'forget' to multi-variant world orderJunio C Hamano2016-04-06
| * | rerere: gc and clearJunio C Hamano2016-04-06
| * | rerere: do use multiple variantsJunio C Hamano2016-03-15
| * | t4200: rerere a merge with two identical conflictsJunio C Hamano2016-03-15
| * | rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano2016-03-15
* | | Merge branch 'jk/use-write-script-more'Junio C Hamano2016-04-22
|\ \ \
| * | | t3404: use write_scriptJunio C Hamano2016-04-12
| * | | t1020: do not overuse printf and use write_scriptJunio C Hamano2016-04-11
| * | | t5532: use write_scriptJeff King2016-04-10
* | | | Merge branch 'ad/commit-have-m-option'Junio C Hamano2016-04-22
|\ \ \ \
| * | | | commit: do not ignore an empty message given by -m ''Jeff King2016-04-07
| * | | | commit: --amend -m '' silently fails to wipe messageAdam Dinwoodie2016-04-07
* | | | | Merge branch 'sb/submodule-helper-clone-regression-fix'Junio C Hamano2016-04-22
|\ \ \ \ \
| * | | | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-01
| * | | | | recursive submodules: test for relative pathsStefan Beller2016-03-31
| * | | | | Merge 'hv/submodule-config' to 'sb/submodule-helper'Junio C Hamano2015-08-19
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/branch-shortening-funny-symrefs'Junio C Hamano2016-04-18
|\ \ \ \ \ \ \
| * | | | | | | branch: fix shortening of non-remote symrefsJeff King2016-04-04
* | | | | | | | Merge branch 'ky/branch-m-worktree'Junio C Hamano2016-04-18
|\ \ \ \ \ \ \ \
| * | | | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-04
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \
| * | | | | | | | correct blame for files commited with CRLFTorsten Bögershausen2016-04-05
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \
| * | | | | | | | pretty: test --expand-tabsJunio C Hamano2016-04-04
| * | | | | | | | pretty: enable --expand-tabs by default for selected pretty formatsJunio C Hamano2016-03-30
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mj/pull-rebase-autostash'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \
| * | | | | | | | t5520: test --[no-]autostash with pull.rebase=trueMehul Jain2016-04-04
| * | | | | | | | t5520: reduce commom lines of codeMehul Jain2016-04-04
| * | | | | | | | t5520: factor out common "failing autostash" codeMehul Jain2016-04-04
| * | | | | | | | t5520: factor out common "successful autostash" codeMehul Jain2016-04-04
| * | | | | | | | t5520: use better test to check stderr outputMehul Jain2016-04-04
| * | | | | | | | t5520: ensure consistent test conditionsMehul Jain2016-04-04
| * | | | | | | | t5520: use consistent capitalization in test titlesMehul Jain2016-04-04
| * | | | | | | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-21
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'sk/send-pack-all-fix'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \
| * | | | | | | | git-send-pack: fix --all option when used with directoryStanislav Kolotinskiy2016-03-31
* | | | | | | | | Merge branch 'sg/diff-multiple-identical-renames'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diffcore: fix iteration order of identical files during rename detectionSZEDER Gábor2016-03-30
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ky/branch-d-worktree'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch -d: refuse deleting a branch which is currently checked outKazuki Yamaguchi2016-03-29
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rz/worktree-no-checkout'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | worktree: add: introduce --checkout optionRay Zhang2016-03-29
| | |_|_|_|/ / / / | |/| | | | | | |