summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warnJunio C Hamano2015-10-281-1/+1
* t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin2015-10-281-0/+12
* rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-051-0/+15
* git rebase -i: add static check for commands and SHA-1Galan Rémi2015-06-302-0/+44
* git rebase -i: warn about removed commitsGalan Rémi2015-06-301-0/+66
* git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-302-2/+20
* Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-271-2/+6
|\
| * t7063: hide stderr from setup inside prereqJeff King2015-05-271-2/+6
* | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-261-0/+353
|\ \ | |/
| * t7063: tests for untracked cacheNguyễn Thái Ngọc Duy2015-03-121-0/+353
* | Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-261-0/+8
|\ \
| * | pull: make pull.ff=true override merge.ffPaul Tan2015-05-181-0/+8
* | | Merge branch 'pt/pull-log-n'Junio C Hamano2015-05-261-0/+17
|\ \ \
| * | | pull: handle --log=<n>pt/pull-log-nPaul Tan2015-05-181-0/+17
| * | | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Junio C Hamano2015-05-111-4/+4
| |\ \ \
| * \ \ \ Merge branch 'jc/diff-no-index-d-f' into maint-2.3Junio C Hamano2015-05-111-0/+34
| |\ \ \ \
* | \ \ \ \ Merge branch 'sb/t1020-cleanup'Junio C Hamano2015-05-221-4/+7
|\ \ \ \ \ \
| * | | | | | subdirectory tests: code cleanup, uncomment testsb/t1020-cleanupStefan Beller2015-05-181-4/+7
* | | | | | | Merge branch 'jc/ignore-epipe-in-filter'Junio C Hamano2015-05-221-0/+10
|\ \ \ \ \ \ \
| * | | | | | | filter_buffer_or_fd(): ignore EPIPEjc/ignore-epipe-in-filterJunio C Hamano2015-05-201-0/+10
* | | | | | | | Merge branch 'mh/lockfile-retry'Junio C Hamano2015-05-221-0/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | lock_packed_refs(): allow retries when acquiring the packed-refs lockmh/lockfile-retryMichael Haggerty2015-05-141-0/+17
* | | | | | | | | Merge branch 'jk/add-e-kill-editor'Junio C Hamano2015-05-221-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: check return value of launch_editorjk/add-e-kill-editorJeff King2015-05-121-0/+7
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sg/completion-config'Junio C Hamano2015-05-221-0/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: simplify query for config variablessg/completion-configSZEDER Gábor2015-05-121-0/+12
| * | | | | | | | | completion: add a helper function to get config variablesSZEDER Gábor2015-05-121-0/+22
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/ref-directory-file'Junio C Hamano2015-05-222-7/+114
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2015-05-111-7/+7
| * | | | | | | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty2015-05-111-4/+4
| * | | | | | | | | refs: check for D/F conflicts among refs created in a transactionMichael Haggerty2015-05-111-1/+1
| * | | | | | | | | t1404: new tests of ref D/F conflicts within transactionsMichael Haggerty2015-05-111-0/+107
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/write-refs-sooner-2.4'Junio C Hamano2015-05-222-2/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2015-05-121-2/+2
| * | | | | | | | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-121-2/+2
| * | | | | | | | | update-ref: test handling large transactions properlyStefan Beller2015-05-121-0/+28
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mg/log-decorate-HEAD'Junio C Hamano2015-05-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log: decorate HEAD with branch name under --decorate=full, tooJunio C Hamano2015-05-131-1/+1
* | | | | | | | | | Merge branch 'jk/skip-http-tests-under-no-curl'Junio C Hamano2015-05-227-35/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tests: skip dav http-push tests under NO_EXPAT=NoThanksjk/skip-http-tests-under-no-curlJunio C Hamano2015-05-071-0/+6
| * | | | | | | | | | t/lib-httpd.sh: skip tests if NO_CURL is definedJeff King2015-05-077-35/+6
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'kn/cat-file-literally'Junio C Hamano2015-05-191-0/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1006: add tests for git cat-file --allow-unknown-typekn/cat-file-literallyKarthik Nayak2015-05-061-0/+45
* | | | | | | | | | | Merge branch 'jc/merge'Junio C Hamano2015-05-196-22/+157
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/mergeJunio C Hamano2015-04-294-6/+6
| * | | | | | | | | | | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-291-5/+5
| * | | | | | | | | | | t5520: test pulling an octopus into an unborn branchJunio C Hamano2015-04-291-0/+9
| * | | | | | | | | | | t5520: style fixesJunio C Hamano2015-04-291-16/+6
| * | | | | | | | | | | merge: test the top-level merge driverJunio C Hamano2015-04-291-0/+136
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ph/rebase-i-redo'Junio C Hamano2015-05-191-0/+47
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status