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 /revision.h | |
| parent | apply: force matching at the beginning. (diff) | |
| parent | Clean up sha1 file writing (diff) | |
| download | tgif-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 'revision.h')
| -rw-r--r-- | revision.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.h b/revision.h index 48d7b4ca94..bdbdd235d8 100644 --- a/revision.h +++ b/revision.h @@ -58,6 +58,8 @@ struct rev_info { unsigned int abbrev; enum cmit_fmt commit_format; struct log_info *loginfo; + int nr, total; + const char *mime_boundary; /* special limits */ int max_count; |