author | Junio C Hamano <gitster@pobox.com> | |
Mon, 27 Feb 2012 01:13:07 +0000 (17:13 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 27 Feb 2012 01:39:04 +0000 (17:39 -0800) | ||
commit | 80809062452a65146d73ae483415acbc737fabf1 | |
tree | d5b65e07896705f4dda05424a324fd455519d865 | tree | snapshot |
parent | ba998d33e22d6fce4445af5834dc227609672501 | commit | diff |
parent | 62ed0728fe52312f270760187b3280bc51b6c2f0 | commit | diff |
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
* 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
Documentation/RelNotes/1.7.10.txt | diff1 | | | | blob | history |
Documentation/git-p4.txt | diff1 | | diff2 | | blob | history |
Makefile | diff1 | | diff2 | | blob | history |
contrib/fast-import/git-p4 | diff1 | | diff2 | | blob | history |
git-am.sh | diff1 | | diff2 | | blob | history |
t/t4150-am.sh | diff1 | | diff2 | | blob | history |
t/t9809-git-p4-client-view.sh | diff1 | | diff2 | | blob | history |