diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-19 23:15:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-19 23:15:44 -0700 |
| commit | 34a5d35bbd6164cfbe08f5f14e359867ce80955b (patch) | |
| tree | 34021c00b8428d015583c7e9fffc5b8c1d37963e /diffcore.h | |
| parent | 05e8b3d6f43bd28aef85ec6e7658536510d6f959 (diff) | |
| parent | cc185a6a8ac24737a26ec4b40cc401c2db8b2e97 (diff) | |
| download | git-34a5d35bbd6164cfbe08f5f14e359867ce80955b.tar.gz | |
Merge branch 'maint'
* maint:
Start draft release notes for 1.6.0.3
git-repack uses --no-repack-object, not --no-repack-delta.
Typo "bogos" in format-patch error message.
builtin-clone: fix typo
Bust the ghost of long-defunct diffcore-pathspec.
completion: git commit should list --interactive
Conflicts:
RelNotes
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index cc96c20734..8ae35785fd 100644 --- a/diffcore.h +++ b/diffcore.h @@ -92,7 +92,6 @@ extern struct diff_filepair *diff_queue(struct diff_queue_struct *, struct diff_filespec *); extern void diff_q(struct diff_queue_struct *, struct diff_filepair *); -extern void diffcore_pathspec(const char **pathspec); extern void diffcore_break(int); extern void diffcore_rename(struct diff_options *); extern void diffcore_merge_broken(void); |