Skip to main content

Browse the archive

Revision f67d2e82d6d2fd385d3d20e8d348eaf69dc95041 authored by Junio C Hamano on 31 May 2011, 19:19:11 UTC, committed by Junio C Hamano on 31 May 2011, 19:19:11 UTC 
Merge branch 'jk/format-patch-am'
 
* jk/format-patch-am:
  format-patch: preserve subject newlines with -k
  clean up calling conventions for pretty.c functions
  pretty: add pp_commit_easy function for simple callers
  mailinfo: always clean up rfc822 header folding
  t: test subject handling in format-patch / am pipeline

Conflicts:
	builtin/branch.c
	builtin/log.c
	commit.h
2 parent s 1c9d719 + 9553d2b
Raw File
advice.h 
#ifndef ADVICE_H
#define ADVICE_H

#include "git-compat-util.h"

extern int advice_push_nonfastforward;
extern int advice_status_hints;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;

int git_default_advice_config(const char *var, const char *value);

extern void NORETURN die_resolve_conflict(const char *me);

#endif /* ADVICE_H */
back to top