diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-13 12:35:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-13 12:35:22 -0700 |
| commit | 9d9bfea8f50f17fa52ff4a1161ef1d78b71ea40a (patch) | |
| tree | 8a1bebe3b23ac5c72b49f9882b0777901d961b13 /git-mergetool.sh | |
| parent | am: officially deprecate -b/--binary option (diff) | |
| parent | rerere: Document 'rerere remaining' (diff) | |
| download | tgif-9d9bfea8f50f17fa52ff4a1161ef1d78b71ea40a.tar.xz | |
Merge branch 'ph/rerere-doc'
By Phil Hord
* ph/rerere-doc:
rerere: Document 'rerere remaining'
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions