diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-04-10 00:29:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-10 00:29:33 -0700 |
| commit | 179c94b24ae87e28328f9b311489417b66bd62c9 (patch) | |
| tree | 3458de6031a61992cf96700826c29096867cae43 /builtin-merge-recursive.c | |
| parent | GIT 1.5.5 (diff) | |
| parent | core-tutorial.txt: Fix showing the current behaviour. (diff) | |
| download | tgif-179c94b24ae87e28328f9b311489417b66bd62c9.tar.xz | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
core-tutorial.txt: Fix showing the current behaviour.
git-archive: ignore prefix when checking file attribute
Fix documentation syntax of optional arguments in short options.
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions