Files
git/Documentation
Shawn O. Pearce 9800c0df41 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
2008-09-29 11:04:20 -07:00
..
2008-08-01 23:21:44 -07:00
2007-08-10 11:32:42 -07:00
2007-06-07 00:04:01 -07:00
2007-07-24 00:47:05 -07:00
2008-04-22 21:53:37 -07:00
2008-08-16 02:32:36 -07:00
2008-09-06 18:56:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-07-05 18:33:16 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-09 01:40:08 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-09 01:40:08 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-08 18:27:19 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-09-12 16:18:47 -07:00
2008-07-05 18:33:16 -07:00
2008-08-29 00:14:29 -07:00
2008-09-12 13:19:56 -07:00
2008-08-09 01:40:08 -07:00
2007-06-07 00:04:01 -07:00
2007-06-07 00:04:01 -07:00
2007-06-07 00:04:01 -07:00
2007-06-07 00:04:01 -07:00
2007-06-16 01:13:35 -07:00
2007-07-02 00:35:58 -07:00
2007-07-12 12:01:47 -07:00
2007-08-15 15:01:20 -07:00
2007-09-19 03:11:28 -07:00
2008-01-29 22:00:34 -08:00
2007-10-03 02:33:48 -07:00
2007-11-18 14:00:38 -08:00
2007-12-01 11:20:00 -08:00
2008-01-07 22:41:43 -08:00
2008-02-17 00:20:38 -08:00
2008-02-17 00:20:38 -08:00
2008-02-23 11:31:04 -08:00
2008-06-26 17:11:21 -07:00
2008-02-01 19:10:10 -08:00
2008-04-20 11:36:53 -07:00
2008-05-25 21:11:24 -07:00
2008-05-27 22:32:47 -07:00
2008-06-07 11:45:48 -07:00
2008-06-26 17:59:51 -07:00
2008-04-07 21:57:43 -07:00
2008-06-25 17:13:48 -07:00
2008-07-04 01:38:41 -07:00
2008-07-13 15:23:43 -07:00
2008-07-19 10:58:01 -07:00
2008-08-06 13:40:53 -07:00
2008-06-18 13:09:43 -07:00
2008-08-24 14:47:24 -07:00
2008-08-17 11:42:10 -07:00