summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-30 00:00:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-30 00:00:07 -0700
commitbe653d6cb87d17c1d70d31cb7cfcb004d48def7b (patch)
tree5d9eb8e0e0635661448cd98593aec739f7190e85 /Documentation/git-merge-one-file.txt
parentMerge branch 'jc/notes-batch-removal' (diff)
parentgit-grep: Fix problems with recently added tests (diff)
downloadtgif-be653d6cb87d17c1d70d31cb7cfcb004d48def7b.tar.xz
Merge branch 'mk/grep-pcre'
* mk/grep-pcre: git-grep: Fix problems with recently added tests git-grep: Update tests (mainly for -P) Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS git-grep: update tests now regexp type is "last one wins" git-grep: do not die upon -F/-P when grep.extendedRegexp is set. git-grep: Bail out when -P is used with -F or -E grep: Add basic tests configure: Check for libpcre git-grep: Learn PCRE grep: Extract compile_regexp_failed() from compile_regexp() grep: Fix a typo in a comment grep: Put calls to fixmatch() and regmatch() into patmatch() contrib/completion: --line-number to git grep Documentation: Add --line-number to git-grep synopsis
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions