summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-097-7/+7
|\
| * code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-317-7/+7
* | Merge branch 'cn/fetch-prune-overlapping-destination' into maintJunio C Hamano2014-04-091-0/+20
|\ \
| * | fetch: handle overlaping refspecs on --prunecn/fetch-prune-overlapping-destinationCarlos Martín Nieto2014-03-261-1/+1
| * | fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto2014-02-281-0/+20
* | | Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-091-0/+11
|\ \ \
| * | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fixAman Gupta2014-04-021-0/+11
* | | | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-04-091-4/+2
|\ \ \ \
| * | | | t4212: loosen far-in-future test for AIXjk/commit-dates-parsing-fixJeff King2014-04-011-4/+2
* | | | | Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-082-9/+58
|\ \ \ \ \
| * | | | | merge hook tests: fix and update testsBenoit Pierre2014-03-181-6/+21
| * | | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-181-2/+2
| * | | | | test patch hunk editing with "commit -p -m"Benoit Pierre2014-03-181-0/+34
| * | | | | merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre2014-03-111-2/+2
| * | | | | merge hook tests: fix missing '&&' in testBenoit Pierre2014-03-111-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-031-1/+12
|\ \ \ \ \
| * | | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fixbrian m. carlson2014-03-171-1/+12
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano2014-04-031-18/+19
|\ \ \ \ \
| * | | | | t/lib-terminal: make TTY a lazy prerequisitejk/lib-terminal-lazyJeff King2014-03-141-18/+19
| |/ / / /
* | | | | Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-031-2/+2
|\ \ \ \ \
| * | | | | test-lib.sh: do not "echo" caller-supplied stringsus/printf-not-echoUwe Storbeck2014-03-181-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'jn/wt-status' into maintJunio C Hamano2014-04-032-13/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | wt-status: lift the artificual "at least 20 columns" floorjn/wt-statusJunio C Hamano2014-03-122-13/+13
| |/ / /
* | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-181-0/+16
|\ \ \ \
| * | | | clean: respect pathspecs with "-d"Jeff King2014-03-111-0/+16
| | |/ / | |/| |
* | | | Merge branch 'da/difftool-git-files' into maintJunio C Hamano2014-03-181-0/+14
|\ \ \ \
| * | | | t7800: add a difftool test for .git-filesda/difftool-git-filesJunio C Hamano2014-03-051-0/+14
| |/ / /
* | | | Merge branch 'jk/remote-pushremote-config-reading' into maintJunio C Hamano2014-03-181-0/+13
|\ \ \ \
| * | | | remote: handle pushremote config in any orderjk/remote-pushremote-config-readingJeff King2014-02-241-0/+13
| |/ / /
* | | | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-03-182-0/+59
|\ \ \ \ | | |_|/ | |/| |
| * | | log: do not segfault on gmtime errorsJeff King2014-02-241-0/+8
| * | | log: handle integer overflow in timestampsJeff King2014-02-241-0/+16
| * | | fsck: report integer overflow in author timestampsJeff King2014-02-241-0/+14
| * | | t4212: test bogus timestamps with git-logJeff King2014-02-241-0/+21
* | | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-181-1/+29
|\ \ \ \
| * | | | diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktreeThomas Rast2014-02-181-1/+29
* | | | | Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-181-0/+11
|\ \ \ \ \
| * | | | | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktreeNguyễn Thái Ngọc Duy2014-02-181-0/+11
| | |_|/ / | |/| | |
| * | | | Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2014-02-131-0/+39
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano2014-02-131-0/+17
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/allow-fetch-onelevel-refname' into maintJunio C Hamano2014-02-131-0/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/interpret-branch-name-fix' into maintJunio C Hamano2014-02-132-1/+51
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maintJunio C Hamano2014-02-131-0/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ow/stash-with-ifs' into maintJunio C Hamano2014-02-051-0/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano2014-02-052-1/+36
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2014-02-051-0/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/log-decoration' into maintJunio C Hamano2014-02-051-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano2014-02-051-1/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/clone-ssh-with-colon-for-port' into maintJunio C Hamano2014-02-052-21/+198
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-181-22/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status