aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano2016-05-18
|\
| * t5504: drop sigpipe=ok from push testsJeff King2016-04-20
* | Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-18
|\ \
| * | mv: allow moving nested submodulesStefan Beller2016-04-19
* | | Merge branch 'ld/p4-test-py3' into HEADJunio C Hamano2016-05-18
|\ \ \
| * | | git-p4 tests: time_in_seconds should use $PYTHON_PATHLuke Diamand2016-04-26
| * | | git-p4 tests: work with python3 as well as python2Luke Diamand2016-04-26
| * | | git-p4 tests: cd to / before running pythonLuke Diamand2016-04-26
* | | | Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-06
|\ \ \ \
| * | | | t7407: make expectation as clear as possibleStefan Beller2016-03-30
| * | | | submodule update: test recursive path reporting from subdirectoryStefan Beller2016-03-30
| * | | | submodule update: align reporting path for custom command executionStefan Beller2016-03-30
| * | | | submodule status: correct path handling in recursive submodulesStefan Beller2016-03-30
| * | | | submodule update --init: correct path handling in recursive submodulesStefan Beller2016-03-30
| * | | | submodule foreach: correct path display in recursive submodulesStefan Beller2016-03-30
* | | | | Merge branch 'jk/use-write-script-more' into maintJunio C Hamano2016-05-02
|\ \ \ \ \
| * | | | | 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' into maintJunio C Hamano2016-05-02
|\ \ \ \ \
| * | | | | 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' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \
| * | | | | | 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' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: fix shortening of non-remote symrefsJeff King2016-04-04
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \ \ \
| * | | | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-04
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \ \ \
| * | | | | | | | branch -d: refuse deleting a branch which is currently checked outKazuki Yamaguchi2016-03-29
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-29
|\ \ \ \ \ \ \ \
| * | | | | | | | correct blame for files commited with CRLFTorsten Bögershausen2016-04-05
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-29
|\ \ \ \ \ \ \ \
| * | | | | | | | git-send-pack: fix --all option when used with directoryStanislav Kolotinskiy2016-03-31
* | | | | | | | | Merge branch 'sg/diff-multiple-identical-renames' into maintJunio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | diffcore: fix iteration order of identical files during rename detectionSZEDER Gábor2016-03-30
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano2016-03-23
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: do not lose SQUASH_MSG contentsSven Strickroth2016-03-21
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar2016-03-10
| * | | | | | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-10
* | | | | | | | | Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-07
| * | | | | | | | | setup: make startup_info available everywhereJeff King2016-03-06
* | | | | | | | | | Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorJeff King2016-03-05
| | |/ / / / / / / / | |/| | | | | | | |