summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-251-1/+10
|\
| * commit: do not complain of empty messages from -Cjk/commit-C-pick-emptyJeff King2014-04-281-1/+10
* | Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-251-0/+9
|\ \
| * | blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-081-0/+9
* | | Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-251-8/+4
|\ \ \
| * | | apply --ignore-space-change: lines with and without leading whitespaces do no...jc/apply-ignore-whitespaceJunio C Hamano2014-03-261-8/+4
| | |/ | |/|
* | | Merge branch 'as/pretty-truncate' into maintJunio C Hamano2014-06-254-71/+276
|\ \ \
| * | | pretty.c: format string with truncate respects logOutputEncodingas/pretty-truncateAlexey Shumkin2014-05-212-7/+7
| * | | t4205, t6006: add tests that fail with i18n.logOutputEncoding setAlexey Shumkin2014-05-212-2/+213
| * | | t4205 (log-pretty-format): use `tformat` rather than `format`Alexey Shumkin2014-05-211-39/+13
| * | | t4041, t4205, t6006, t7102: don't hardcode tested encoding valueAlexey Shumkin2014-05-214-27/+39
| * | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin2014-05-191-3/+11
* | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2014-06-121-0/+4
|\ \ \ \
| * | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-wordsJeff King2014-06-041-0/+4
* | | | | t5537: re-drop http testsJeff King2014-05-301-28/+0
* | | | | Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Junio C Hamano2014-05-201-8/+23
* | | | | Merge branch 'jc/graduate-remote-hg-bzr' (early part)Junio C Hamano2014-05-191-23/+8
|\ \ \ \ \
| * | | | | Revert "Merge branch 'fc/transport-helper-sync-error-fix'"Junio C Hamano2014-05-191-23/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-191-3/+3
|\ \ \ \ \
| * | | | | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-191-3/+3
* | | | | | Merge branch 'lt/request-pull'Junio C Hamano2014-05-191-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | request-pull: resurrect for-linus -> tags/for-linus DWIMJunio C Hamano2014-05-161-1/+7
* | | | | | Merge branch 'km/git-svn-workaround-older-getopt-long'Junio C Hamano2014-05-021-4/+4
|\ \ \ \ \ \
| * | | | | | t9117: use --prefix "" instead of --prefix=""km/git-svn-workaround-older-getopt-longKyle J. McKay2014-04-231-4/+4
* | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-021-22/+22
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | git-prompt.sh: don't put unsanitized branch names in $PS1Richard Hansen2014-04-221-22/+22
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fc/transport-helper-sync-error-fix'Junio C Hamano2014-04-241-8/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | t5801 (remote-helpers): cleanup environment setsfc/transport-helper-sync-error-fixFelipe Contreras2014-04-211-7/+4
| * | | | | transport-helper: fix sync issue on crashesFelipe Contreras2014-04-141-1/+19
* | | | | | Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not givenJohan Herland2014-04-1918-126/+126
* | | | | | Merge branch 'km/avoid-cp-a'Junio C Hamano2014-04-161-2/+2
|\ \ \ \ \ \
| * | | | | | test: fix t7001 cp to use POSIX optionskm/avoid-cp-aKyle J. McKay2014-04-111-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'km/avoid-bs-in-shell-glob'Junio C Hamano2014-04-161-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | test: fix t5560 on FreeBSDkm/avoid-bs-in-shell-globKyle J. McKay2014-04-111-2/+2
| |/ / / /
* | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-081-0/+31
|\ \ \ \ \
| * | | | | add `ignore_missing_links` mode to revwalkVicent Marti2014-04-041-0/+31
* | | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-087-7/+7
|\ \ \ \ \ \
| * | | | | | code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-317-7/+7
| * | | | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-181-0/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'da/difftool-git-files' into maintJunio C Hamano2014-03-181-0/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/remote-pushremote-config-reading' into maintJunio C Hamano2014-03-181-0/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-03-182-0/+59
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-181-1/+29
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-181-0/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-181-22/+40
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-181-0/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano2014-03-181-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/http-fetch-shallow-fix' into maintJunio C Hamano2014-03-189-35/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-182-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mh/update-ref-batch-create-fix'Junio C Hamano2014-04-081-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \