1
0
mirror of https://github.com/git/git.git synced 2024-10-23 02:49:36 +02:00
git/contrib/fast-import
Junio C Hamano 8080906245 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
2012-02-26 17:39:04 -08:00
..
git-import.perl
git-import.sh
git-p4 Merge branch 'maint' 2012-02-26 17:39:04 -08:00
git-p4.bat
import-directories.perl
import-tars.perl
import-zips.py