summaryrefslogtreecommitdiff
path: root/t/t1021-rerere-in-workdir.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-10-25 06:41:57 -0400
committerLibravatar Jeff King <peff@peff.net>2012-10-25 06:41:57 -0400
commit8de8f9f656696a3c04e5f0a274b57e4a719a66ce (patch)
tree181e8f9626ed245aab923a60294085ffd368cc55 /t/t1021-rerere-in-workdir.sh
parentMerge branch 'jk/no-more-pre-exec-callback' (diff)
parentt4055: avoid use of sed 'a' command (diff)
downloadtgif-8de8f9f656696a3c04e5f0a274b57e4a719a66ce.tar.xz
Merge branch 'jm/diff-context-config'
Teaches a new configuration variable to "git diff" Porcelain and its friends. * jm/diff-context-config: t4055: avoid use of sed 'a' command diff: diff.context configuration gives default to -U
Diffstat (limited to 't/t1021-rerere-in-workdir.sh')
0 files changed, 0 insertions, 0 deletions