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 /gitk-git/gitk | |
parent | diff.c: fix emit_line() again not to add extra line (diff) | |
parent | GIT 1.5.4.6 (diff) | |
download | tgif-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 'gitk-git/gitk')
0 files changed, 0 insertions, 0 deletions