mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pn/commit-autosquash'

Browse Source 
* pn/commit-autosquash:
  add tests of commit --squash
  commit: --squash option for use with rebase --autosquash
  add tests of commit --fixup
  commit: --fixup option for use with rebase --autosquash
  pretty.c: teach format_commit_message() to reencode the output
  commit: helper methods to reduce redundant blocks of code

Conflicts:
	Documentation/git-commit.txt
	t/t3415-rebase-autosquash.sh
This commit is contained in:
Junio C Hamano
2010-12-03 16:13:06 -08:00
parent 45a7b55d6f 7951bd3029
commit 9bec60d3a5
13 changed files with 267 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cache.h
View File

@ -1004,6 +1004,9 @@ extern int git_env_bool(const char *, int);
extern int git_config_system(void);
extern int git_config_global(void);
extern int config_error_nonbool(const char *);
extern const char *get_log_output_encoding(void);
extern const char *get_commit_output_encoding(void);
extern const char *config_exclusive_filename;
#define MAX_GITNAME (1000)