diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-24 14:08:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-24 14:08:30 -0700 |
| commit | 4868f3729acce2aa9512ded7179a895cc50f64c8 (patch) | |
| tree | 928359b4870e80980bc78f66f0c37ad156367ccb /diff.h | |
| parent | 65aadb92a1ce9605fa2f412b51de91781a3ef3d6 (diff) | |
| parent | 4d548150ace0816dd5fe678cdbde75b13d5e5249 (diff) | |
| download | git-4868f3729acce2aa9512ded7179a895cc50f64c8.tar.gz git-4868f3729acce2aa9512ded7179a895cc50f64c8.tar.xz | |
Merge branch 'master' into lt/apply
* master: (40 commits)
Clean up sha1 file writing
Builtin git-cat-file
builtin format-patch: squelch content-type for 7-bit ASCII
CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
add more informative error messages to git-mktag
remove the artificial restriction tagsize < 8kb
git-rebase: use canonical A..B syntax to format-patch
git-format-patch: now built-in.
fmt-patch: Support --attach
fmt-patch: understand old <his> notation
Teach fmt-patch about --keep-subject
Teach fmt-patch about --numbered
fmt-patch: implement -o <dir>
fmt-patch: output file names to stdout
Teach fmt-patch to write individual files.
Use RFC2822 dates from "git fmt-patch".
git-fmt-patch: thinkofix to show [PATCH] properly.
rename internal format-patch wip
Minor tweak on subject line in --pretty=email
Tentative built-in format-patch.
...
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -44,6 +44,7 @@ struct diff_options { int rename_limit; int setup; int abbrev; + const char *stat_sep; int nr_paths; const char **paths; @@ -52,6 +53,8 @@ struct diff_options { add_remove_fn_t add_remove; }; +extern const char mime_boundary_leader[]; + extern void diff_tree_setup_paths(const char **paths, struct diff_options *); extern void diff_tree_release_paths(struct diff_options *); extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, |