mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2012-02-26 17:13:07 -08:00
parent ba998d33e2 62ed0728fe
commit 8080906245
12 changed files with 291 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/RelNotes/1.7.10.txt
View File

@ -87,15 +87,6 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
releases are contained in this release (see release notes to them for
details).
* The config.mak.autogen generated by optional autoconf support tried
to link the binary with -lintl even when libintl.h is missing from
the system.
(merge a8356d4 js/configure-libintl later to maint).
* "git add --refresh <pathspec>" used to warn about unmerged paths
outside the given pathspec.
(merge 3d1f148 jc/add-refresh-unmerged later to maint).
* "gitweb" used to drop warnings in the log file when "heads" view is
accessed in a repository whose HEAD does not point at a valid
branch.