summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* difftool: handle unmerged files in dir-diff modeda/difftoolDavid Aguilar2016-05-161-0/+23
* Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-062-5/+126
|\
| * t7407: make expectation as clear as possiblesb/submodule-path-misc-bugsStefan Beller2016-03-301-2/+6
| * submodule update: test recursive path reporting from subdirectoryStefan Beller2016-03-301-0/+20
| * submodule update: align reporting path for custom command executionStefan Beller2016-03-301-3/+26
| * submodule status: correct path handling in recursive submodulesStefan Beller2016-03-301-0/+21
| * submodule update --init: correct path handling in recursive submodulesStefan Beller2016-03-301-0/+33
| * submodule foreach: correct path display in recursive submodulesStefan Beller2016-03-301-0/+20
* | Merge branch 'jk/use-write-script-more' into maintJunio C Hamano2016-05-023-18/+20
|\ \
| * | t3404: use write_scriptjk/use-write-script-moreJunio C Hamano2016-04-121-4/+3
| * | t1020: do not overuse printf and use write_scriptJunio C Hamano2016-04-111-5/+5
| * | t5532: use write_scriptJeff King2016-04-101-9/+12
| |/
* | Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-021-0/+20
|\ \
| * | commit: do not ignore an empty message given by -m ''ad/commit-have-m-optionJeff King2016-04-071-3/+3
| * | commit: --amend -m '' silently fails to wipe messageAdam Dinwoodie2016-04-071-0/+20
* | | Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-021-0/+41
|\ \ \
| * | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-011-1/+1
| * | | recursive submodules: test for relative pathsStefan Beller2016-03-311-0/+41
| * | | Merge 'hv/submodule-config' to 'sb/submodule-helper'Junio C Hamano2015-08-191-0/+153
| |\ \ \
* | \ \ \ Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-021-0/+12
|\ \ \ \ \
| * | | | | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-041-0/+12
* | | | | | Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-021-1/+22
|\ \ \ \ \ \
| * | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-041-1/+22
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-021-0/+6
|\ \ \ \ \ \
| * | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-291-0/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-291-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 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-291-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' into maintJunio C Hamano2016-04-291-0/+11
|\ \ \ \ \ \ \
| * | | | | | | diffcore: fix iteration order of identical files during rename detectionsg/diff-multiple-identical-renamesSZEDER Gábor2016-03-301-0/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-141-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' into maintJunio C Hamano2016-04-141-0/+28
|\ \ \ \ \ \ \
| * | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-211-0/+28
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-141-0/+64
|\ \ \ \ \ \ \
| * | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflictDavid Aguilar2016-03-101-0/+25
| * | | | | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-101-0/+39
* | | | | | | | Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-142-5/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-071-0/+27
| * | | | | | | | setup: make startup_info available everywhereJeff King2016-03-061-5/+0
* | | | | | | | | Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-141-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorjk/getwholeline-getdelim-emptyJeff King2016-03-051-0/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-141-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-011-0/+14
* | | | | | | | | | Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-141-0/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-parse: let some options run outside repositoryjk/rev-parse-local-env-varsJeff King2016-02-291-2/+2
| * | | | | | | | | | t1515: add tests for rev-parse out-of-repo helpersJeff King2016-02-281-0/+45
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-141-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-281-0/+3
| |/ / / / / / / / /
View Lorry Controller Status