diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-14 00:16:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-14 00:16:42 -0700 |
| commit | 16007f3916b885d29de6c48832aa6a4213ab7588 (patch) | |
| tree | a32a16393cb312398d8c96e61daef15cb708b7f2 /builtin-config.c | |
| parent | ca885a4fe6444bed840295378848904106c87c85 (diff) | |
| parent | 1b56bc9a1545902db64b8bdce48a499900acfe0b (diff) | |
| download | git-16007f3916b885d29de6c48832aa6a4213ab7588.tar.gz | |
Merge branch 'maint'
* maint:
merge-file: handle empty files gracefully
merge-recursive: handle file mode changes
Minor wording changes in the keyboard descriptions in git-add --interactive.
git fetch: Take '-n' to mean '--no-tags'
quiltimport: fix misquoting of parsed -p<num> parameter
git-quiltimport: better parser to grok "enhanced" series files.
Diffstat (limited to 'builtin-config.c')
0 files changed, 0 insertions, 0 deletions