summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2012-04-16Merge branch 'jc/commit-unedited-template'Libravatar Junio C Hamano1-0/+14
2012-04-16Merge branch 'wk/gitweb-snapshot-use-if-modified-since'Libravatar Junio C Hamano1-1/+59
2012-04-16Merge branch 'jk/http-backend-keep-committer-ident-env'Libravatar Junio C Hamano2-0/+28
2012-04-16Merge branch 'jk/diff-no-rename-empty'Libravatar Junio C Hamano1-0/+16
2012-04-16Merge branch 'jc/maint-clean-nested-worktree-in-subdir'Libravatar Junio C Hamano1-5/+22
2012-04-15Merge branch 'da/difftool-test'Libravatar Junio C Hamano1-0/+11
2012-04-15Merge branch 'zj/test-cred-helper-nicer-prove'Libravatar Junio C Hamano1-24/+45
2012-04-15Merge branch 'jh/notes-merge-in-git-dir-worktree'Libravatar Junio C Hamano1-4/+23
2012-04-15Merge branch 'tr/maint-word-diff-regex-sticky'Libravatar Junio C Hamano1-0/+36
2012-04-15Merge branch 'jn/diffstat-tests'Libravatar Junio C Hamano16-259/+354
2012-04-15Merge branch 'jc/commit-hook-authorship'Libravatar Junio C Hamano1-0/+18
2012-04-15Merge branch 'nd/stream-more'Libravatar Junio C Hamano1-2/+36
2012-04-15merge overwrites unstaged changes in renamed fileLibravatar Clemens Buchacher1-0/+9
2012-03-30commit: rephrase the error when user did not touch templated log messageLibravatar Junio C Hamano1-0/+6
2012-03-30commit: do not trigger bogus "has templated message edited" checkLibravatar Junio C Hamano1-0/+6
2012-03-30t7501: test the right kind of breakageLibravatar Junio C Hamano1-0/+2
2012-03-30http-backend: respect existing GIT_COMMITTER_* variablesLibravatar Jeff King2-0/+28
2012-03-30gitweb: add If-Modified-Since handling to git_snapshot().Libravatar W. Trevor King1-0/+33
2012-03-30gitweb: refactor If-Modified-Since handlingLibravatar W. Trevor King1-1/+26
2012-03-27tests: unset COLUMNS inherited from environmentLibravatar Zbigniew Jędrzejewski-Szmek1-1/+1
2012-03-26Merge branch 'jn/maint-fast-import-empty-ls' into maintLibravatar Junio C Hamano1-0/+39
2012-03-26Merge branch 'ms/maint-config-error-at-eol-linecount' into maintLibravatar Junio C Hamano1-0/+31
2012-03-23merge-recursive: don't detect renames of empty filesLibravatar Jeff King1-0/+16
2012-03-20Merge branch 'maint-1.7.8' into maintLibravatar Junio C Hamano2-3/+11
2012-03-20Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8Libravatar Junio C Hamano1-3/+3
2012-03-20Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8Libravatar Junio C Hamano1-0/+8
2012-03-19t7800: Test difftool passing arguments to diffLibravatar David Aguilar1-0/+11
2012-03-16Merge "two fixes for fast-import's 'ls' command" from JonathanLibravatar Junio C Hamano1-0/+39
2012-03-15clean: preserve nested git worktree in subdirectoriesLibravatar Junio C Hamano1-5/+22
2012-03-15notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdLibravatar Johan Herland1-4/+4
2012-03-15notes-merge: use opendir/readdir instead of using read_directory()Libravatar Johan Herland1-1/+1
2012-03-15t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Libravatar Johan Herland1-0/+19
2012-03-15t0303: resurrect commit message as test documentationLibravatar Zbigniew Jędrzejewski-Szmek1-1/+29
2012-03-15t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPERLibravatar Zbigniew Jędrzejewski-Szmek1-23/+16
2012-03-14diff: tweak a _copy_ of diff_options with word-diffLibravatar Thomas Rast1-1/+1
2012-03-14t4034: diff.*.wordregex should not be "sticky" in --word-diffLibravatar Johannes Sixt1-0/+36
2012-03-13diffstat summary line varies by locale: miscellanyLibravatar Jonathan Nieder8-64/+96
2012-03-13test: use numstat instead of diffstat in binary-diff testLibravatar Jonathan Nieder1-6/+23
2012-03-13test: use --numstat instead of --stat in "git stash show" testsLibravatar Jonathan Nieder1-7/+19
2012-03-13test: test cherry-pick functionality and output separatelyLibravatar Jonathan Nieder1-8/+22
2012-03-13test: modernize funny-names test styleLibravatar Jonathan Nieder1-167/+180
2012-03-13test: use numstat instead of diffstat in funny-names testLibravatar Jonathan Nieder1-10/+17
2012-03-13test: use test_i18ncmp when checking --stat outputLibravatar Jonathan Nieder8-16/+16
2012-03-13Merge branch 'jc/maint-undefined-i18n-observation-test'Libravatar Junio C Hamano1-14/+23
2012-03-13Merge branch 'ms/maint-config-error-at-eol-linecount'Libravatar Junio C Hamano1-0/+31
2012-03-12Merge branch 'tr/maint-bundle-boundary' into maintLibravatar Junio C Hamano1-22/+35
2012-03-12Merge branch 'jc/maint-diff-patch-header' into maintLibravatar Junio C Hamano1-85/+110
2012-03-12Merge branch 'jc/am-3-nonstandard-popt' into maintLibravatar Junio C Hamano1-0/+15
2012-03-12config: report errors at the EOL with correct line numberLibravatar Martin Stenberg1-0/+31
2012-03-11commit: pass author/committer info to hooksLibravatar Junio C Hamano1-1/+1