diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-01-10 10:39:18 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-01-10 10:39:18 -0800 |
commit | 7a876edf5d5224e0755cfabb808b042f300e293d (patch) | |
tree | 66921050c562f00200bd13c014356edcd086be3d /t/t6020-merge-df.sh | |
parent | Git 1.7.2.5 (diff) | |
parent | Merge branch 'maint-1.7.0' into maint-1.7.1 (diff) | |
download | tgif-7a876edf5d5224e0755cfabb808b042f300e293d.tar.xz |
Merge branch 'maint-1.7.1' into maint-1.7.2
* maint-1.7.1:
Documentation/githooks: post-rewrite-copy-notes never existed
Documentation/git-archive: spell --worktree-attributes correctly
Diffstat (limited to 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions