diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:06 -0800 |
| commit | b984bc58ce4e67de7e7f1b360c9e153fb6398bca (patch) | |
| tree | 6d8f8e68cd612133020725788345866b336a88be /git-mergetool--lib.sh | |
| parent | 5bc5edbae1c5c3756a8927913d32d2b7519e30b0 (diff) | |
| parent | 29401e15754518a0e63e00d6cabc5a5f2f9b0973 (diff) | |
| download | git-b984bc58ce4e67de7e7f1b360c9e153fb6398bca.tar.gz git-b984bc58ce4e67de7e7f1b360c9e153fb6398bca.tar.xz | |
Merge branch 'jk/index-pack-wo-repo-from-stdin' into maint
"git index-pack --stdin" needs an access to an existing repository,
but "git index-pack file.pack" to generate an .idx file that
corresponds to a packfile does not.
* jk/index-pack-wo-repo-from-stdin:
index-pack: skip collision check when not in repository
t: use nongit() function where applicable
index-pack: complain when --stdin is used outside of a repo
t5000: extract nongit function to test-lib-functions.sh
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions