Skip to main content

Browse the archive

Staging
v0.8.1
Revision c36c5b845e1958bad1b69ee42e3da926de4f948b authored by Marc-Andre Lureau on 12 March 2008, 19:54:21 UTC, committed by Junio C Hamano on 13 March 2008, 04:03:39 UTC 
git-cvsimport: fix merging with remote parent branch
 
commit-tree fails when specifying a remote name (via -r option) and
one of the parent branch has a name. Prefixing with "$remote/" fix it.

Signed-off-by: Marc-Andre Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7863c61
Raw File
progress.h 
#ifndef PROGRESS_H
#define PROGRESS_H

struct progress;

void display_throughput(struct progress *progress, off_t total);
int display_progress(struct progress *progress, unsigned n);
struct progress *start_progress(const char *title, unsigned total);
struct progress *start_progress_delay(const char *title, unsigned total,
				       unsigned percent_treshold, unsigned delay);
void stop_progress(struct progress **progress);
void stop_progress_msg(struct progress **progress, const char *msg);

#endif
back to top