![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2008 07:16:42 +0000 (00:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2008 07:16:42 +0000 (00:16 -0700) | ||
| commit | 16007f3916b885d29de6c48832aa6a4213ab7588 | |
| tree | a32a16393cb312398d8c96e61daef15cb708b7f2 | tree | snapshot |
| parent | ca885a4fe6444bed840295378848904106c87c85 | commit | diff |
| parent | 1b56bc9a1545902db64b8bdce48a499900acfe0b | commit | diff |
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.
* 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.
| builtin-fetch.c | diff1 | | diff2 | | blob | history |
| builtin-merge-file.c | diff1 | | diff2 | | blob | history |
| builtin-merge-recursive.c | diff1 | | | | blob | history |
| xdiff-interface.c | diff1 | | diff2 | | blob | history |