diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-17 01:52:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-17 01:52:32 -0700 |
| commit | 46dc1b0e332612aa32c139007fa33f4b429de9d1 (patch) | |
| tree | 86e934ac60e69c03c44a9d59eab6e400c16efb5f /index-pack.c | |
| parent | Add Linux PPC support to the pre-auto-gc example hook (diff) | |
| parent | t1301-shared-repo.sh: don't let a default ACL interfere with the test (diff) | |
| download | git-46dc1b0e332612aa32c139007fa33f4b429de9d1.tar.gz git-46dc1b0e332612aa32c139007fa33f4b429de9d1.zip | |
Merge branch 'maint'
* maint:
t1301-shared-repo.sh: don't let a default ACL interfere with the test
git-check-attr(1): add output and example sections
xdiff-interface.c: strip newline (and cr) from line before pattern matching
t4018-diff-funcname: demonstrate end of line funcname matching flaw
t4018-diff-funcname: rework negated last expression test
Typo "does not exists" when git remote update remote.
remote.c: correct the check for a leading '/' in a remote name
Add testcase to ensure merging an early part of a branch is done properly
Conflicts:
t/t7600-merge.sh
Diffstat (limited to 'index-pack.c')
0 files changed, 0 insertions, 0 deletions