diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 03:28:43 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 03:58:39 +0200 |
| commit | 89d750bf6fa025edeb31ad258cdd09a27a5c02fa (patch) | |
| tree | 4d39de078c00f56b2c17eaef94989d098dd4621d /Documentation | |
| parent | attr: fix segfault in gitattributes parsing code (diff) | |
| download | git-89d750bf6fa025edeb31ad258cdd09a27a5c02fa.tar.xz git-89d750bf6fa025edeb31ad258cdd09a27a5c02fa.zip | |
Avoid invoking diff drivers during git-stash
git-stash needs to restrict itself to plumbing when running automated
diffs as part of its operation as the user may have configured a
custom diff driver that opens an interactive UI for certain/all
files. Doing that during scripted actions is very unfriendly to
the end-user and may cause git-stash to fail to work.
Reported by Johannes Sixt
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions