diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-26 17:14:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-26 17:14:03 -0700 |
| commit | 53b22a9e45161004ff3260782abc4ee2a5b3e730 (patch) | |
| tree | 0d12b068502c3cc0512ec44628c26f75c6438b16 /Documentation/pretty-options.txt | |
| parent | 4afbcab9898ce63ad641dd0de6e9b69deda44330 (diff) | |
| parent | 872354dcb3ce5f34f7ddb12d2c89d26a1ea4daf0 (diff) | |
| download | git-53b22a9e45161004ff3260782abc4ee2a5b3e730.tar.gz git-53b22a9e45161004ff3260782abc4ee2a5b3e730.tar.xz | |
Merge branch 'maint-1.5.4' into maint-1.5.5
* maint-1.5.4:
GIT 1.5.4.6
git-shell: accept "git foo" form
Conflicts:
GIT-VERSION-GEN
RelNotes
Diffstat (limited to 'Documentation/pretty-options.txt')
0 files changed, 0 insertions, 0 deletions