summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t1410: fix breakage on case-insensitive filesystemsjk/fetch-reflog-df-conflictJeff King2014-11-101-18/+18
* ignore stale directories when checking reflog existenceJeff King2014-11-041-0/+34
* fetch: load all default config at startupJeff King2014-11-041-0/+40
* commit --amend: test specifies authorship but forgets to checkFabian Ruch2014-07-301-0/+1
* t4013: test diff-tree's --stdin commit formattingJeff King2014-07-281-0/+10
* Merge branch 'zk/log-graph-showsig' into maintJunio C Hamano2014-07-221-0/+31
|\
| * log: fix indentation for --graph --show-signaturezk/log-graph-showsigZoltan Klinger2014-07-091-0/+31
* | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maintJunio C Hamano2014-07-221-0/+11
|\ \
| * | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-mergesCharles Bailey2014-07-011-0/+11
* | | Merge branch 'jm/dedup-test-config' into maintJunio C Hamano2014-07-221-5/+0
|\ \ \
| * | | t/t7810-grep.sh: remove duplicate test_config()jm/dedup-test-configJeremiah Mahler2014-06-051-5/+0
* | | | Merge branch 'sk/test-cmp-bin' into maintJunio C Hamano2014-07-225-22/+28
|\ \ \ \
| * | | | t5000, t5003: do not use test_cmp to compare binary filessk/test-cmp-binStepan Kasal2014-06-045-22/+28
* | | | | Merge branch 'lt/request-pull' into maintJunio C Hamano2014-07-221-1/+1
|\ \ \ \ \
| * | | | | fix brown paper bag breakage in t5150-request-pull.shlt/request-pullJohannes Sixt2014-06-021-1/+1
* | | | | | Merge branch 'ep/shell-assign-and-export-vars' into maintJunio C Hamano2014-07-222-2/+10
|\ \ \ \ \ \
| * | | | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-varsJunio C Hamano2014-05-232-2/+10
* | | | | | | Merge branch 'jk/pretty-G-format-fixes' into maintJunio C Hamano2014-07-162-9/+68
|\ \ \ \ \ \ \
| * | | | | | | move "%G" format test from t7510 to t6006jk/pretty-G-format-fixesJeff King2014-06-252-6/+6
| * | | | | | | pretty: avoid reading past end-of-string with "%G"Jeff King2014-06-171-0/+6
| * | | | | | | t7510: check %G* pretty-format outputJeff King2014-06-171-0/+40
| * | | | | | | t7510: test a commit signed by an unknown keyJeff King2014-06-171-0/+13
| * | | | | | | t7510: use consistent &&-chains in loopMichael J Gruber2014-06-171-6/+6
| * | | | | | | t7510: stop referring to master in later testsJeff King2014-06-171-3/+3
* | | | | | | | Merge branch 'bc/fix-rebase-merge-skip' into maintJunio C Hamano2014-07-161-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skipbrian m. carlson2014-06-161-0/+15
| * | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-281-3/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-282-0/+38
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-081-22/+22
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'km/avoid-bs-in-shell-glob' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/avoid-cp-a' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/trim-trailing-spaces' into maintJunio C Hamano2014-07-101-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t0008: do not depend on 'echo' handling backslashes speciallypb/trim-trailing-spacesJunio C Hamano2014-06-131-6/+8
| * | | | | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequencePasha Bolokhov2014-06-021-0/+23
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maintJunio C Hamano2014-07-101-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | repack: respect pack.writebitmapsJeff King2014-06-101-1/+17
| * | | | | | | | | | | | | | repack: do not accidentally pack kept objects by defaultJeff King2014-06-101-1/+1
* | | | | | | | | | | | | | | Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | t7300: repair filesystem permissions with test_when_finishedJeff King2014-07-021-2/+2
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2014-06-252-59/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t5538: move http push tests out to t5542na/no-http-test-in-the-middleNick Alcock2014-05-302-59/+100
* | | | | | | | | | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignoredJens Lehmann2014-04-071-1/+1
| * | | | | | | | | | | | | | status/commit: show staged submodules regardless of ignore configJens Lehmann2014-04-071-2/+72
* | | | | | | | | | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano2014-06-253-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-mergesMax Kirillov2014-05-153-10/+13
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-251-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fixMatthieu Moy2014-05-201-0/+15
* | | | | | | | | | | | | | | | Merge branch 'jc/shortlog-ref-exclude' into maintJunio C Hamano2014-06-251-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | shortlog: allow --exclude=<glob> to be passedjc/shortlog-ref-excludeJunio C Hamano2014-06-041-0/+6