Skip to main content

Browse the archive

https://github.com/git/git
22 May 2024, 15:28:21 UTC
Revision 9da87231905913e9e33b30bbe92b54037a6b30ca authored by David Glasser on 16 October 2017, 23:09:59 UTC, committed by David Glasser on 17 October 2017, 09:43:55 UTC 
doc: list filter-branch subdirectory-filter first
 
The docs claim that filters are applied in the listed order, so
subdirectory-filter should come first.

For consistency, apply the same order to the SYNOPSIS and the script's usage, as
well as the switch while parsing arguments.

Add missing --prune-empty to the script's usage.

Signed-off-by: David Glasser <glasser@davidglasser.net>
1 parent 4010f1d
Raw File
Tip revision: 9da87231905913e9e33b30bbe92b54037a6b30ca authored by David Glasser on 16 October 2017, 23:09:59 UTC
doc: list filter-branch subdirectory-filter first
Tip revision: 9da8723
advice.h 
#ifndef ADVICE_H
#define ADVICE_H

#include "git-compat-util.h"

extern int advice_push_update_rejected;
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_matching;
extern int advice_push_already_exists;
extern int advice_push_fetch_first;
extern int advice_push_needs_force;
extern int advice_status_hints;
extern int advice_status_u_option;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;
extern int advice_object_name_warning;
extern int advice_rm_hints;
extern int advice_add_embedded_repo;

int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))
void advise(const char *advice, ...);
int error_resolve_conflict(const char *me);
extern void NORETURN die_resolve_conflict(const char *me);
void NORETURN die_conclude_merge(void);
void detach_advice(const char *new_name);

#endif /* ADVICE_H */
back to top