diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:51 -0700 |
| commit | faadedb19538a9968dd2d607bcab00be1916bd31 (patch) | |
| tree | 8636f755fa6b929248d66075040e6b98a51e047b /git-gui/lib/mergetool.tcl | |
| parent | Merge branch 'bw/protocol-v2' (diff) | |
| parent | add: do not accept pathspec magic 'attr' (diff) | |
| download | tgif-faadedb19538a9968dd2d607bcab00be1916bd31.tar.xz | |
Merge branch 'nd/attr-pathspec-fix'
"git add ':(attr:foo)'" is not supported and is supposed to be
rejected while the command line arguments are parsed, but we fail
to reject such a command line upfront.
* nd/attr-pathspec-fix:
add: do not accept pathspec magic 'attr'
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions