summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-25 13:46:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-25 13:46:42 -0700
commitf7b1ad870c46c53685ef83efbfd7d9ca1983a191 (patch)
tree3d37b13993699ccd8f1bebc1b4b93546da3e9bda /t/t6020-merge-df.sh
parenttransport.c: help gcc 4.6.3 users by squelching compiler warning (diff)
parentMerge branch 'lf/bundle-verify-list-prereqs' into maint-1.8.1 (diff)
downloadtgif-f7b1ad870c46c53685ef83efbfd7d9ca1983a191.tar.xz
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1: bundle: Add colons to list headings in "verify" bundle: Fix "verify" output if history is complete Documentation: filter-branch env-filter example git-filter-branch.txt: clarify ident variables usage git-compat-util.h: Provide missing netdb.h definitions describe: Document --match pattern format Documentation/githooks: Explain pre-rebase parameters update-index: list supported idx versions and their features diff-options: unconfuse description of --color read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr() index-format.txt: mention of v4 is missing in some places
Diffstat (limited to 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions