diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-21 07:28:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 07:28:50 +0300 |
| commit | fcb2a7e4a3c7899a3432f5804889fa3ea5779220 (patch) | |
| tree | 0f0785d427c23c7b8dbaae1afcdbd370ea3b639c /git-compat-util.h | |
| parent | e98f80f50bf9b78aab8cea6184fd708259d0c3b3 (diff) | |
| parent | 566c511195adc0ce88559853f2f00933e241d862 (diff) | |
Merge branch 'ap/merge-backend-opts'
* ap/merge-backend-opts:
Document that merge strategies can now take their own options
Extend merge-subtree tests to test -Xsubtree=dir.
Make "subtree" part more orthogonal to the rest of merge-recursive.
pull: Fix parsing of -X<option>
Teach git-pull to pass -X<option> to git-merge
git merge -X<option>
git-merge-file --ours, --theirs
Conflicts:
git-compat-util.h
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 60c8432f85..aff627a85a 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -199,6 +199,7 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2))) extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params)); extern int prefixcmp(const char *str, const char *prefix); +extern int suffixcmp(const char *str, const char *suffix); static inline const char *skip_prefix(const char *str, const char *prefix) { |