diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:18:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:18:07 -0700 |
| commit | e7734c6c9b04d78e970b8de4765cdebd984ec6e6 (patch) | |
| tree | 5b82e7fdb271f0f414e56916bb5dd7d653ed2e93 /Documentation/git-patch-id.txt | |
| parent | Merge branch 'ms/daemon-timeout-is-in-seconds' (diff) | |
| parent | am: format is in $patch_format, not parse_patch (diff) | |
| download | tgif-e7734c6c9b04d78e970b8de4765cdebd984ec6e6.tar.xz | |
Merge branch 'gb/maint-am-patch-format-error-message'
* gb/maint-am-patch-format-error-message:
am: format is in $patch_format, not parse_patch
Conflicts:
git-am.sh
Diffstat (limited to 'Documentation/git-patch-id.txt')
0 files changed, 0 insertions, 0 deletions