summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-clean-nested-worktree-in-subdir'Junio C Hamano2012-04-161-5/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdirJunio C Hamano2012-03-151-5/+22
* | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool-test'Junio C Hamano2012-04-151-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t7800: Test difftool passing arguments to diffda/difftool-testDavid Aguilar2012-03-191-0/+11
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'zj/test-cred-helper-nicer-prove'Junio C Hamano2012-04-151-24/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t0303: resurrect commit message as test documentationzj/test-cred-helper-nicer-proveZbigniew Jędrzejewski-Szmek2012-03-151-1/+29
| * | | | | | | | | | | | | | | | | | | | | t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPERZbigniew Jędrzejewski-Szmek2012-03-151-23/+16
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/notes-merge-in-git-dir-worktree'Junio C Hamano2012-04-151-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
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-word-diff-regex-sticky'Junio C Hamano2012-04-151-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-stickyThomas Rast2012-03-141-1/+1