diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:32:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:32:16 -0700 |
| commit | aaf4d399f4dcf2b841d9dab53612374bc877bb07 (patch) | |
| tree | f2d7b026b9e90ed5468ca8c541a7255be69f682c /ll-merge.h | |
| parent | Merge branch 'tr/fd-gotcha-fixes' (diff) | |
| parent | die_with_status: use "printf '%s\n'", not "echo" (diff) | |
| download | tgif-aaf4d399f4dcf2b841d9dab53612374bc877bb07.tar.xz | |
Merge branch 'mm/no-shell-escape-in-die-message'
Fixes a minor bug in "git rebase -i" (there could be others, as the
root cause is pretty generic) where the code feeds a random, data
dependeant string to 'echo' and expects it to come out literally.
* mm/no-shell-escape-in-die-message:
die_with_status: use "printf '%s\n'", not "echo"
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions