summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hv/submodule-recurse-push'Junio C Hamano2012-04-242-0/+127
|\
| * push: teach --recurse-submodules the on-demand optionHeiko Voigt2012-03-301-0/+94
| * Teach revision walking machinery to walk multiple times sequenciallyHeiko Voigt2012-03-301-0/+33
* | Merge branch 'bw/test-fix-grep-gnuism'Junio C Hamano2012-04-231-2/+2
|\ \
| * | t9400: fix gnuism in grepJunio C Hamano2012-04-191-2/+2
* | | Merge branch 'jn/more-i18ncmp'Junio C Hamano2012-04-233-8/+8
|\ \ \
| * | | test: am of empty patch should not succeedJonathan Nieder2012-04-141-1/+1
| * | | test: use test_i18ncmp for "Patch format detection failed" messageJonathan Nieder2012-04-141-1/+1
| * | | test: do not rely on US English tracking-info messagesJonathan Nieder2012-04-142-6/+6
* | | | Merge branch 'lp/maint-diff-three-dash-with-graph'Junio C Hamano2012-04-231-0/+290
|\ \ \ \
| * | | | t4202: add test for "log --graph --stat -p" separator lineslp/maint-diff-three-dash-with-graphLucian Poston2012-03-201-0/+290
* | | | | Merge branch 'sl/test-wc-l-line-count'Junio C Hamano2012-04-2319-74/+65
|\ \ \ \ \
| * | | | | tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-1119-74/+65
| | |/ / / | |/| | |
* | | | | Merge branch 'rl/show-empty-prefix'Junio C Hamano2012-04-231-1/+1
|\ \ \ \ \
| * | | | | rev-parse --show-prefix: add in trailing newlineRoss Lagerwall2012-04-101-1/+1
| |/ / / /
* | | | | Merge branch 'pw/git-p4'Junio C Hamano2012-04-2312-184/+182
|\ \ \ \ \
| * | | | | git p4: use "git p4" directly in testsPete Wyckoff2012-04-0912-184/+182
| * | | | | git-p4: move to toplevelPete Wyckoff2012-04-091-1/+1
| |/ / / /
* | | | | Merge branch 'jk/rebase-i-submodule-conflict-only'Junio C Hamano2012-04-231-0/+30
|\ \ \ \ \
| * | | | | rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-091-0/+30
| | |_|/ / | |/| | |
| * | | | Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano2012-04-091-0/+93
| |\ \ \ \
| * \ \ \ \ Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Junio C Hamano2012-04-091-0/+28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Junio C Hamano2012-04-091-22/+35
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Junio C Hamano2012-04-091-24/+23
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'ct/advise-push-default'Junio C Hamano2012-04-202-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix httpd tests that broke when non-ff push advice changedChristopher Tiwald2012-04-122-2/+2
* | | | | | | | | | Merge branch 'jk/run-command-eacces'Junio C Hamano2012-04-201-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | run-command: treat inaccessible directories as ENOENTJeff King2012-04-051-0/+13
* | | | | | | | | | | Merge branch 'jc/push-upstream-sanity'Junio C Hamano2012-04-201-0/+54
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-051-0/+54
* | | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-04-201-3/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-peopleJunio C Hamano2012-03-131-3/+24
* | | | | | | | | | | | | Merge branch 'jk/add-p-skip-conflicts'Junio C Hamano2012-04-161-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add--interactive: ignore unmerged entries in patch modeJeff King2012-04-051-0/+26
* | | | | | | | | | | | | | Merge branch 'jc/commit-unedited-template'Junio C Hamano2012-04-161-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 'wk/gitweb-snapshot-use-if-modified-since'Junio C Hamano2012-04-161-1/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gitweb: add If-Modified-Since handling to git_snapshot().W. Trevor King2012-03-301-0/+33
| * | | | | | | | | | | | | | gitweb: refactor If-Modified-Since handlingW. Trevor King2012-03-301-1/+26
* | | | | | | | | | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env'Junio C Hamano2012-04-162-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | http-backend: respect existing GIT_COMMITTER_* variablesJeff King2012-03-302-0/+28
| * | | | | | | | | | | | | | | Merge branch 'jn/maint-fast-import-empty-ls' into maintJunio C Hamano2012-03-261-0/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/maint-config-error-at-eol-linecount' into maintJunio C Hamano2012-03-261-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-202-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8Junio C Hamano2012-03-201-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8Junio C Hamano2012-03-201-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-161-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-emptyJeff King2012-03-231-0/+16
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
View Lorry Controller Status