diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-31 10:57:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 10:57:32 -0700 |
| commit | 2d11f21c365821ccba1e093f22b99ad71b955f21 (patch) | |
| tree | 1ecbe232f12904520838ab4adff6aa70d5ba6e80 /t/.gitignore | |
| parent | diff: futureproof "stop feeding the backend early" logic (diff) | |
| parent | Merge branch 'jm/maint-misc-fix' into maint (diff) | |
| download | tgif-2d11f21c365821ccba1e093f22b99ad71b955f21.tar.xz | |
Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
* ko/maint: (4352 commits)
git-submodule.sh: separate parens by a space to avoid confusing some shells
Documentation/technical/api-diff.txt: correct name of diff_unmerge()
read_gitfile_gently: use ssize_t to hold read result
remove tests of always-false condition
rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
Git 1.7.5.3
init/clone: remove short option -L and document --separate-git-dir
do not read beyond end of malloc'd buffer
git-svn: Fix git svn log --show-commit
Git 1.7.5.2
provide a copy of the LGPLv2.1
test core.gitproxy configuration
copy_gecos: fix not adding nlen to len when processing "&"
Update draft release notes to 1.7.5.2
Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
send-pack: avoid deadlock on git:// push with failed pack-objects
connect: let callers know if connection is a socket
connect: treat generic proxy processes like ssh processes
sideband_demux(): fix decl-after-stmt
t3503: test cherry picking and reverting root commits
...
Conflicts:
diff.c
Diffstat (limited to 't/.gitignore')
| -rw-r--r-- | t/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/.gitignore b/t/.gitignore index 7dcbb232cd..4e731dc1e3 100644 --- a/t/.gitignore +++ b/t/.gitignore @@ -1,2 +1,3 @@ /trash directory* /test-results +/.prove |