diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-26 17:13:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-26 17:39:04 -0800 |
| commit | 80809062452a65146d73ae483415acbc737fabf1 (patch) | |
| tree | d5b65e07896705f4dda05424a324fd455519d865 /t/t3308-notes-merge.sh | |
| parent | Update draft release notes to 1.7.10 (diff) | |
| parent | Document accumulated fixes since 1.7.9.2 (diff) | |
| download | tgif-80809062452a65146d73ae483415acbc737fabf1.tar.xz | |
Merge branch 'maint'
* maint:
Document accumulated fixes since 1.7.9.2
Git 1.7.8.5
grep -P: Fix matching ^ and $
am: don't infloop for an empty input file
rebase -m: only call "notes copy" when rewritten exists and is non-empty
git-p4: remove bash-ism in t9800
git-p4: remove bash-ism in t9809
git-p4: fix submit regression with clientSpec and subdir clone
git-p4: set useClientSpec variable on initial clone
Makefile: add thread-utils.h to LIB_H
Conflicts:
RelNotes
t/t9809-git-p4-client-view.sh
Diffstat (limited to 't/t3308-notes-merge.sh')
0 files changed, 0 insertions, 0 deletions