diff options
| author |  Jeff King <peff@peff.net> | 2012-10-25 06:41:57 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-25 06:41:57 -0400 |
| commit | 8de8f9f656696a3c04e5f0a274b57e4a719a66ce (patch) | |
| tree | 181e8f9626ed245aab923a60294085ffd368cc55 /Documentation/technical/trivial-merge.txt | |
| parent | Merge branch 'jk/no-more-pre-exec-callback' (diff) | |
| parent | t4055: avoid use of sed 'a' command (diff) | |
| download | tgif-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 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions