diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:44:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:44:56 -0800 |
| commit | 7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b (patch) | |
| tree | 6cd9d67bad0f51acbe6baef3fea257f8b0cbc01a /rerere.c | |
| parent | am: don't persist keepcr flag (diff) | |
| parent | Git 1.7.6.5 (diff) | |
| download | tgif-7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b.tar.xz | |
Merge branch 'maint-1.7.6' into maint-1.7.7
* maint-1.7.6:
Git 1.7.6.5
blame: don't overflow time buffer
fetch: create status table using strbuf
Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions