summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/run-command-eacces' into maintJunio C Hamano2012-04-261-0/+13
|\
| * run-command: treat inaccessible directories as ENOENTJeff King2012-04-051-0/+13
* | Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-261-0/+54
|\ \
| * | push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-051-0/+54
* | | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maintJunio C Hamano2012-04-261-5/+22
|\ \ \
| * | | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdirJunio C Hamano2012-03-151-5/+22
* | | | Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-261-0/+16
|\ \ \ \
| * | | | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-emptyJeff King2012-03-231-0/+16
* | | | | Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-261-0/+14
|\ \ \ \ \
| * | | | | commit: rephrase the error when user did not touch templated log messageJunio C Hamano2012-03-301-0/+6
| * | | | | commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2012-03-301-0/+6
| * | | | | t7501: test the right kind of breakageJunio C Hamano2012-03-301-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/add-p-skip-conflicts' into maintJunio C Hamano2012-04-261-0/+26
|\ \ \ \ \
| * | | | | add--interactive: ignore unmerged entries in patch modeJeff King2012-04-051-0/+26
* | | | | | Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-261-0/+18
|\ \ \ \ \ \
| * | | | | | commit: pass author/committer info to hooksjc/commit-hook-authorshipJunio C Hamano2012-03-111-1/+1
| * | | | | | t7503: does pre-commit-hook learn authorship?Junio C Hamano2012-03-111-0/+18
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2012-04-261-0/+36
|\ \ \ \ \ \
| * | | | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-stickyThomas Rast2012-03-141-1/+1
| * | | | | | t4034: diff.*.wordregex should not be "sticky" in --word-diffJohannes Sixt2012-03-141-0/+36
| * | | | | | Merge branch 'tr/maint-bundle-boundary' into maintJunio C Hamano2012-03-121-22/+35
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-121-85/+110
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano2012-03-121-0/+15
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintJunio C Hamano2012-04-261-4/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktreeJohan Herland2012-03-151-4/+4
| * | | | | | | | | notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2012-03-151-1/+1
| * | | | | | | | | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Johan Herland2012-03-151-0/+19
| |/ / / / / / / /
* | | | | | | | | tests: unset COLUMNS inherited from environmentZbigniew Jędrzejewski-Szmek2012-03-271-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge "two fixes for fast-import's 'ls' command" from JonathanJunio C Hamano2012-03-161-0/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-import: don't allow 'ls' of path with empty componentsjn/maint-fast-import-empty-lsJonathan Nieder2012-03-091-0/+39
* | | | | | | | | Merge branch 'jc/maint-undefined-i18n-observation-test'Junio C Hamano2012-03-131-14/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t0204: clarify the "observe undefined behaviour" testjc/maint-undefined-i18n-observation-testJunio C Hamano2012-03-091-14/+23
* | | | | | | | | | Merge branch 'ms/maint-config-error-at-eol-linecount'Junio C Hamano2012-03-131-0/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: report errors at the EOL with correct line numberms/maint-config-error-at-eol-linecountMartin Stenberg2012-03-121-0/+31
* | | | | | | | | | | p4000: use -3000 when promising -3000Thomas Rast2012-03-091-1/+1
* | | | | | | | | | | Merge branch 'jl/maint-submodule-relative'Junio C Hamano2012-03-082-0/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodules: refactor computation of relative gitdir pathJens Lehmann2012-03-041-0/+17
| * | | | | | | | | | | submodules: always use a relative path from gitdir to work treeJens Lehmann2012-03-041-0/+20
| * | | | | | | | | | | submodules: always use a relative path to gitdirJens Lehmann2012-03-041-0/+2
* | | | | | | | | | | | perf: export some important test-lib variablesThomas Rast2012-03-082-1/+14
* | | | | | | | | | | | perf: load test-lib-functions from the correct directoryThomas Rast2012-03-082-1/+6
* | | | | | | | | | | | Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano2012-03-071-0/+119
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pickaxe: allow -i to search in patch case-insensitivelyJunio C Hamano2012-02-281-0/+119
* | | | | | | | | | | | | Merge branch 'jc/maint-diff-patch-header'Junio C Hamano2012-03-061-85/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | diff -p: squelch "diff --git" header for stat-dirty pathsjc/maint-diff-patch-headerJunio C Hamano2012-03-011-4/+1
| * | | | | | | | | | | | t4011: illustrate "diff-index -p" on stat-dirty pathsJunio C Hamano2012-03-011-7/+39
| * | | | | | | | | | | | t4011: modernise styleJunio C Hamano2012-03-011-86/+82
* | | | | | | | | | | | | Merge branch 'cn/pull-rebase-message'Junio C Hamano2012-03-061-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-messageCarlos Martín Nieto2012-03-041-4/+2
* | | | | | | | | | | | | | Merge branch 'sl/modern-t0000'Junio C Hamano2012-03-061-274/+289
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status