diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-29 22:04:20 +0400 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-29 22:04:20 +0400 |
commit | 9800c0df412869c7949935b61581b9361fc49bd1 (patch) | |
tree | 837cb43f80452126e46ff5de641f14b7b349484f /bundle.h | |
parent | 9ba929ed652f5ed7707f1c684999af4ad02c4925 (diff) | |
parent | 5a139ba483efea47e103fef47afe87157e3bba77 (diff) |
Merge branch 'bc/master-diff-hunk-header-fix'
* bc/master-diff-hunk-header-fix:
Clarify commit error message for unmerged files
Use strchrnul() instead of strchr() plus manual workaround
Use remove_path from dir.c instead of own implementation
Add remove_path: a function to remove as much as possible of a path
git-submodule: Fix "Unable to checkout" for the initial 'update'
Clarify how the user can satisfy stash's 'dirty state' check.
t4018-diff-funcname: test syntax of builtin xfuncname patterns
t4018-diff-funcname: test syntax of builtin xfuncname patterns
make "git remote" report multiple URLs
diff hunk pattern: fix misconverted "\{" tex macro introducers
diff: fix "multiple regexp" semantics to find hunk header comment
diff: use extended regexp to find hunk headers
diff: use extended regexp to find hunk headers
diff.*.xfuncname which uses "extended" regex's for hunk header selection
diff.c: associate a flag with each pattern and use it for compiling regex
diff.c: return pattern entry pointer rather than just the hunk header pattern
Conflicts:
builtin-merge-recursive.c
t/t7201-co.sh
xdiff-interface.h
Diffstat (limited to 'bundle.h')
0 files changed, 0 insertions, 0 deletions