diff options
author | Junio C Hamano <junkio@cox.net> | 2006-10-23 05:40:30 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-10-23 05:40:30 (GMT) |
commit | 02a20456d2c5efccbdd0093ad2a16134f160c218 (patch) | |
tree | 7377c60146663d9a6402d6742be92591eefa07b2 /builtin.h | |
parent | 87b787ac77e0d8f81468dcba2a39c9d0287870c3 (diff) | |
parent | 0abc0260fa3419de649fcc1444e3d256a17ca6c7 (diff) | |
download | git-02a20456d2c5efccbdd0093ad2a16134f160c218.zip git-02a20456d2c5efccbdd0093ad2a16134f160c218.tar.gz git-02a20456d2c5efccbdd0093ad2a16134f160c218.tar.bz2 |
Merge branch 'maint'
* maint:
pager: default to LESS=FRSX not LESS=FRS
Make prune also run prune-packed
git-vc: better installation instructions
gitweb: Do not esc_html $basedir argument to git_print_tree_entry
gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
Fix usagestring for git-branch
git-merge: show usage if run without arguments
Diffstat (limited to 'builtin.h')
-rw-r--r-- | builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -11,6 +11,7 @@ extern int mailinfo(FILE *in, FILE *out, int ks, const char *encoding, const cha extern int split_mbox(const char **mbox, const char *dir, int allow_bare, int nr_prec, int skip); extern void stripspace(FILE *in, FILE *out); extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix); +extern void prune_packed_objects(int); extern int cmd_add(int argc, const char **argv, const char *prefix); extern int cmd_apply(int argc, const char **argv, const char *prefix); |