summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* branch: do not rename a branch under bisect or rebasend/worktree-various-headsNguyễn Thái Ngọc Duy2016-04-221-0/+8
* worktree.c: check whether branch is bisected in another worktreeNguyễn Thái Ngọc Duy2016-04-221-0/+13
* worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-221-0/+38
* Merge branch 'jk/branch-shortening-funny-symrefs'Junio C Hamano2016-04-181-0/+12
|\
| * branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-041-0/+12
* | Merge branch 'ky/branch-m-worktree'Junio C Hamano2016-04-181-1/+22
|\ \
| * | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-041-1/+22
* | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-131-0/+14
|\ \ \
| * | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlfTorsten Bögershausen2016-04-051-0/+14
* | | | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-132-1/+106
|\ \ \ \
| * | | | pretty: test --expand-tabslt/pretty-expand-tabsJunio C Hamano2016-04-041-0/+105
| * | | | pretty: enable --expand-tabs by default for selected pretty formatsJunio C Hamano2016-03-301-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'mj/pull-rebase-autostash'Junio C Hamano2016-04-131-7/+67
|\ \ \ \
| * | | | t5520: test --[no-]autostash with pull.rebase=truemj/pull-rebase-autostashMehul Jain2016-04-041-0/+10
| * | | | t5520: reduce commom lines of codeMehul Jain2016-04-041-9/+7
| * | | | t5520: factor out common "failing autostash" codeMehul Jain2016-04-041-15/+11
| * | | | t5520: factor out common "successful autostash" codeMehul Jain2016-04-041-29/+15
| * | | | t5520: use better test to check stderr outputMehul Jain2016-04-041-6/+4
| * | | | t5520: ensure consistent test conditionsMehul Jain2016-04-041-0/+2
| * | | | t5520: use consistent capitalization in test titlesMehul Jain2016-04-041-2/+2
| * | | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-211-0/+70
* | | | | Merge branch 'sk/send-pack-all-fix'Junio C Hamano2016-04-131-0/+12
|\ \ \ \ \
| * | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fixStanislav Kolotinskiy2016-03-311-0/+12
* | | | | | Merge branch 'sg/diff-multiple-identical-renames'Junio C Hamano2016-04-131-0/+11
|\ \ \ \ \ \
| * | | | | | diffcore: fix iteration order of identical files during rename detectionsg/diff-multiple-identical-renamesSZEDER Gábor2016-03-301-0/+11
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ky/branch-d-worktree'Junio C Hamano2016-04-131-0/+6
|\ \ \ \ \ \
| * | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-291-0/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rz/worktree-no-checkout'Junio C Hamano2016-04-131-0/+12
|\ \ \ \ \ \
| * | | | | | worktree: add: introduce --checkout optionrz/worktree-no-checkoutRay Zhang2016-03-291-0/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-0810-11/+35
|\ \ \ \ \ \
| * | | | | | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-2310-11/+35
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'la/tag-force-signing-annotated-tags'Junio C Hamano2016-04-061-0/+41
|\ \ \ \ \ \
| * | | | | | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tagsLaurent Arnoud2016-03-221-0/+41
* | | | | | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-04-063-0/+57
|\ \ \ \ \ \ \
| * | | | | | | git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERSJeff King2016-03-231-0/+14
| * | | | | | | git: submodule honor -c credential.* from command lineJacob Keller2016-03-012-0/+43
* | | | | | | | Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-061-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-231-0/+10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ss/commit-squash-msg'Junio C Hamano2016-04-061-0/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-211-0/+28
* | | | | | | | | Merge branch 'sb/rebase-x'Junio C Hamano2016-04-061-13/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t3404: cleanup double empty lines between testssb/rebase-xStefan Beller2016-03-181-6/+0
| * | | | | | | | | rebase: decouple --exec from --interactiveStefan Beller2016-03-181-7/+6
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/test-httpd-config-nosystem'Junio C Hamano2016-04-061-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envjk/test-httpd-config-nosystemJeff King2016-03-181-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/clone-t57-t56'Junio C Hamano2016-04-0610-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone tests: rename t57* => t56*sb/clone-t57-t56Stefan Beller2016-03-1610-0/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ls/p4-map-user'Junio C Hamano2016-04-061-0/+61
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: map a P4 user to Git author name and email addressls/p4-map-userLars Schneider2016-03-151-0/+61
| |/ / / / / / / /
| * | | | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-101-0/+179
| |\ \ \ \ \ \ \ \
View Lorry Controller Status