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 /builtin-diff.c | |
| parent | 65aadb92a1ce9605fa2f412b51de91781a3ef3d6 (diff) | |
| parent | 4d548150ace0816dd5fe678cdbde75b13d5e5249 (diff) | |
| download | 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 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index de81b05e32..27451d5613 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -233,7 +233,7 @@ static int builtin_diff_combined(struct rev_info *revs, return 0; } -static void add_head(struct rev_info *revs) +void add_head(struct rev_info *revs) { unsigned char sha1[20]; struct object *obj; |