diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-14 02:44:18 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-14 02:44:18 -0500 |
| commit | 1fcdd62adf81a172f45c7c6a58177212d500b9d9 (patch) | |
| tree | 94acde078fd78c3d214fe09d45e85ed346a2f2d4 /generate-cmdlist.sh | |
| parent | 9938ffc53a15c755bbd3894c02492b940ea34c4c (diff) | |
| parent | 696b1b507f8ff9e80a2edc4eced59ca8cdda920e (diff) | |
| download | git-1fcdd62adf81a172f45c7c6a58177212d500b9d9.tar.gz git-1fcdd62adf81a172f45c7c6a58177212d500b9d9.tar.xz | |
Merge branch 'master' into sp/fast-import
I'm bringing master in early so that the OBJ_OFS_DELTA implementation
is available as part of the topic. This way git-fast-import can
learn about this new slightly smaller and faster packfile format,
and can generate them directly rather than needing to have them be
repacked with git-pack-objects.
Due to the API changes in master during the period of development
of git-fast-import, a few minor tweaks to fast-import.c are needed
to produce a working merge. I've done them here as part of the
merge to ensure bisection always works.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'generate-cmdlist.sh')
| -rwxr-xr-x | generate-cmdlist.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh index ec1eda20d..975777f05 100755 --- a/generate-cmdlist.sh +++ b/generate-cmdlist.sh @@ -4,7 +4,7 @@ echo "/* Automatically generated by $0 */ struct cmdname_help { char name[16]; - char help[64]; + char help[80]; }; struct cmdname_help common_cmds[] = {" @@ -12,6 +12,7 @@ struct cmdname_help common_cmds[] = {" sort <<\EOF | add apply +archive bisect branch checkout @@ -21,7 +22,7 @@ commit diff fetch grep -init-db +init log merge mv @@ -36,7 +37,6 @@ show show-branch status tag -verify-tag EOF while read cmd do |